linux-kernel - Re: linux-next: manual merge of the kunit-next tree with the thunderbolt 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>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 20 Apr 2022 13:45:32 +0300
From:   Mika Westerberg <mika.westerberg@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Shuah Khan <skhan@...uxfoundation.org>,
        Brendan Higgins <brendanhiggins@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ricardo Ribalda <ribalda@...omium.org>
Subject: Re: linux-next: manual merge of the kunit-next tree with the
 thunderbolt tree

Hi Stephen,

On Wed, Apr 20, 2022 at 03:16:12PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got a conflict in:
> 
>   drivers/thunderbolt/test.c
> 
> between commit:
> 
>   9d2d0a5cf0ca ("thunderbolt: Use different lane for second DisplayPort tunnel")
> 
> from the thunderbolt tree and commit:
> 
>   7aadf8433357 ("thunderbolt: test: use NULL macros")
> 
> from the kunit-next tree.
> 
> I fixed it up (see below) 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.

The fixup looks good to me, thanks!