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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20201027111218.7c34f762@canb.auug.org.au>
Date:   Tue, 27 Oct 2020 11:12:18 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        Shuah Khan <skhan@...uxfoundation.org>,
        Brendan Higgins <brendanhiggins@...gle.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: linux-next: manual merge of the v4l-dvb-next tree with the
 kunit-fixes tree

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

Content of type "application/pgp-signature" skipped