linux-next: manual merge of the v4l-dvb-next tree with the kunit-fixes tree

[Stephen Rothwell]

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: pgpZpWN9ik4bK.pgp
Description: OpenPGP digital signature