From: David Gow <david@davidgow•net>
To: Mark Brown <broonie@kernel•org>,
Shuah Khan <skhan@linuxfoundation•org>,
Brendan Higgins <brendan.higgins@linux•dev>,
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: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Wed, 4 Mar 2026 17:16:13 +0800 [thread overview]
Message-ID: <e305159b-13fc-4084-bcbe-968388575627@davidgow.net> (raw)
In-Reply-To: <aabpbnOt9nCuQrfu@sirena.org.uk>
Le 03/03/2026 à 10:00 PM, Mark Brown a écrit :
> 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.]
Thanks, Mark. Shuah is definitely the right contact, given the KUnit
branches live in the kselftest trees, but I won't object to being CCed
as well. :-)
Shuah: I suspect the simplest resolution here is just to rebase the
kunit branch on top of kunit-fixes. But it wouldn't be a problem if you
wanted to shunt the stty fix into kunit-fixes instead (though that'd
still require a rebase for the SIGINT handling patch).
Cheers,
-- David
next prev parent reply other threads:[~2026-03-04 9:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-03 14:00 linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Mark Brown
2026-03-04 9:16 ` David Gow [this message]
2026-03-31 19:36 ` Shuah Khan
2026-04-01 10:33 ` Mark Brown
-- 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=e305159b-13fc-4084-bcbe-968388575627@davidgow.net \
--to=david@davidgow$(echo .)net \
--cc=brendan.higgins@linux$(echo .)dev \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=raemoar63@gmail$(echo .)com \
--cc=shuvampandey1@gmail$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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