From: Mark Brown <broonie@kernel.org>
To: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendan.higgins@linux.dev>,
David Gow <david@davidgow.net>, Rae Moar <raemoar63@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shuvam Pandey <shuvampandey1@gmail.com>
Subject: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Tue, 3 Mar 2026 14:00:14 +0000 [thread overview]
Message-ID: <aabpbnOt9nCuQrfu@sirena.org.uk> (raw)
Hi all,
[I note that Shuah is the only contact listed for the KUnit trees, is
that right?]
Today's linux-next merge of the kunit-next tree got a conflict in:
tools/testing/kunit/kunit_tool_test.py
between commit:
40804c4974b8d ("kunit: tool: copy caller args in run_kernel to prevent mutation")
from the kunit-fixes tree and commit:
7e331b560a76d ("kunit: tool: skip stty when stdin is not a tty")
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.
[Sorry, forgot to diff - it's a simple add/add.]
next reply other threads:[~2026-03-03 14:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-03 14:00 Mark Brown [this message]
2026-03-04 9:16 ` linux-next: manual merge of the kunit-next tree with the kunit-fixes tree David Gow
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 2:49 Stephen Rothwell
2023-02-01 4:31 ` David Gow
2023-02-01 5:37 ` Stephen Rothwell
2022-11-01 3:31 Stephen Rothwell
2021-10-08 4:29 Stephen Rothwell
2021-10-08 16:31 ` Shuah Khan
2021-10-08 20:03 ` Brendan Higgins
2021-10-08 20:48 ` Daniel Latypov
2021-10-19 21:26 ` Shuah Khan
2021-10-19 21:40 ` Daniel Latypov
2021-10-19 22:20 ` Stephen Rothwell
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=aabpbnOt9nCuQrfu@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brendan.higgins@linux.dev \
--cc=david@davidgow.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=raemoar63@gmail.com \
--cc=shuvampandey1@gmail.com \
--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