2017-12-11 00:28:57

by Stephen Rothwell

Subject: linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb-next tree got a conflict in:

drivers/staging/media/lirc/lirc_zilog.c

between commit:

c23e0cb81e40 ("media: annotate ->poll() instances")

from the vfs tree and commit:

28032a347ed0 ("media: staging: remove lirc_zilog driver")

from the v4l-dvb-next tree.

I fixed it up (I just removed the file) 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

2017-12-14 16:19:23

by Mauro Carvalho Chehab

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

Hi Stephen,

Em Mon, 11 Dec 2017 11:28:54 +1100
Stephen Rothwell <[email protected]> escreveu:

> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
>
> drivers/staging/media/lirc/lirc_zilog.c
>
> between commit:
>
> c23e0cb81e40 ("media: annotate ->poll() instances")
>
> from the vfs tree and commit:
>
> 28032a347ed0 ("media: staging: remove lirc_zilog driver")
>
> from the v4l-dvb-next tree.
>
> I fixed it up (I just removed the file) 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.

FYI,

I had to rebase the patch series on the top of media tree.

You'll likely be facing the same conflicts with vfs after the
rebase, with different changeset identifiers.


--
Thanks,
Mauro

2017-12-14 22:43:54

by Stephen Rothwell

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

Hi Mauro,

On Thu, 14 Dec 2017 14:19:13 -0200 Mauro Carvalho Chehab <[email protected]> wrote:
>
> FYI,
>
> I had to rebase the patch series on the top of media tree.
>
> You'll likely be facing the same conflicts with vfs after the
> rebase, with different changeset identifiers.

Thanks for letting me know ... it was fine ("git rerere" is very useful :-))

--
Cheers,
Stephen Rothwell