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")
from the staging tree.
I fixed it up (I removed both files - the updates to lirc_sir.c were
also done in the v4l-dvb tree) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
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.
Thanks
Sean
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
On Thu, Apr 06, 2017 at 09:19:22PM +0200, Greg KH wrote:
> 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?
I think this is happening:
On the v4l-dvb tree, 5cd6522 modifies both lirc_sasem.c and lirc_sir.c;
then both files are removed. Now 87ddb91067b9 is merged from the staging
tree and both files don't exist any more, so it no longer applies even
though the patch is the same.
If I drop 87ddb91067b9 from staging-next, I can merge it to v4l-dvb,
otherwise I get merge conflicts.
Thanks
Sean
Hi Sean,
On Thu, 6 Apr 2017 21:39:05 +0100 Sean Young <[email protected]> wrote:
>
> I think this is happening:
>
> On the v4l-dvb tree, 5cd6522 modifies both lirc_sasem.c and lirc_sir.c;
> then both files are removed. Now 87ddb91067b9 is merged from the staging
> tree and both files don't exist any more, so it no longer applies even
> though the patch is the same.
That is exactly right, but ...
> If I drop 87ddb91067b9 from staging-next, I can merge it to v4l-dvb,
> otherwise I get merge conflicts.
The resolution is trivial, so don't worry about it.
--
Cheers,
Stephen Rothwell