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!
