[lkml]   [2019]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,

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


between commit:

77512baaea9a ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237")

from Linus' tree and commit:

513dbd35b5d9 ("media: add SPDX headers to some files")

from the v4l-dvb tree.

I fixed it up (I used the former's SPDX line (GPL-2.0-only v. GPL-2.0),
but the latter's Copyright line) 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2019-06-24 03:43    [W:0.032 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site