From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ricardo Ribalda <ribalda@chromium.org>
Subject: Re: linux-next: manual merge of the kunit-next tree with the thunderbolt tree
Date: Wed, 20 Apr 2022 13:45:32 +0300 [thread overview]
Message-ID: <Yl/kTEZxet0fLPj4@lahna> (raw)
In-Reply-To: <20220420151612.117f84b9@canb.auug.org.au>
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!
prev parent reply other threads:[~2022-04-20 10:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 5:16 linux-next: manual merge of the kunit-next tree with the thunderbolt tree Stephen Rothwell
2022-04-20 10:45 ` Mika Westerberg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yl/kTEZxet0fLPj4@lahna \
--to=mika.westerberg@linux.intel.com \
--cc=brendanhiggins@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ribalda@chromium.org \
--cc=sfr@canb.auug.org.au \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox