lkml.org 
[lkml]   [2019]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the v4l-dvb-next tree with the v4l-dvb tree
On Tue, Apr 23, 2019 at 2:51 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
>
> drivers/media/platform/Kconfig
>
> between commit:
>
> 63604a143fe1 ("media: seco-cec: fix building with RC_CORE=m")
>
> from the v4l-dvb tree and commit:
>
> 81527254e151 ("media: seco: depend on CONFIG_RC_CORE=y when not a module")
>
> from the v4l-dvb-next tree.
>
> I fixed it up (I just used the v4l-dvb tree version) 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.

Thanks!

Both patches are correct, they just use slightly different syntax, so
the merge is fine as well.

Arnd

\
 
 \ /
  Last update: 2019-04-23 10:13    [W:0.042 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site