Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

From	Greg KH <greg@kroah.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date	2017-04-06 21:30 +0200
Message-ID	<ttlgu-54H-5@gated-at.bofh.it> (permalink)
References	<tt6r8-36F-5@gated-at.bofh.it> <ttkX7-4XH-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, Apr 06, 2017 at 07:58:57PM +0100, Sean Young wrote:
> On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the staging tree got conflicts in:
> > 
> >   drivers/staging/media/lirc/lirc_sasem.c
> >   drivers/staging/media/lirc/lirc_sir.c
> > 
> > between commits:
> > 
> >   e66267161971 ("[media] rc: promote lirc_sir out of staging")
> >   51bb3fd788cb ("[media] staging: lirc_sasem: remove")
> > 
> > from the v4l-dvb tree and commit:
> > 
> >   87ddb91067b9 ("Staging: media: lirc - style fix")
> 
> There are two commits which do similar things. In the v4l-dvb tree we have
> 5cd6522 ("[media] staging: lirc: use octal instead of symbolic permission"
> and in the staging tree there is 
> 87ddb91067b9 ("Staging: media: lirc - style fix")
> 
> Is it possible to drop the latter from the staging tree? That would resolve
> the issue.

I can revert the staging patch, if that really helps anything.  Is is
really an issue as both patches do the same thing?

thanks,

greg k-h

Thread

linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-06 05:40 +0200
  Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 21:10 +0200
    Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Greg KH <greg@kroah.com> - 2017-04-06 21:30 +0200
      Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Sean Young <sean@mess.org> - 2017-04-06 22:40 +0200
        Re: linux-next: manual merge of the staging tree with the v4l-dvb  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 00:00 +0200

csiph-web