* linux-next: manual merge of the v4l-dvb-next tree with the kunit-fixes tree
@ 2020-10-27 0:12 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-10-27 0:12 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Shuah Khan, Brendan Higgins
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
include/kunit/test.h
between commit:
7f32b10c6b46 ("kunit: test: fix remaining kernel-doc warnings")
from the kunit-fixes tree and commit:
21f4ea01b15d ("kunit: test: fix remaining kernel-doc warnings")
from the v4l-dvb-next tree.
I fixed it up (I used the former one since it did not have an extra space
before a tab) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-27 0:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 0:12 linux-next: manual merge of the v4l-dvb-next tree with the kunit-fixes tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®