From: Shuah Khan <skhan@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Theodore Ts'o <tytso@mit•edu>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Shuah Khan <shuah@kernel•org>
Cc: John Hubbard <jhubbard@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Shuah Khan <skhan@linuxfoundation•org>
Subject: Re: linux-next: duplicate patches in the random tree
Date: Tue, 9 Jul 2024 12:09:14 -0600 [thread overview]
Message-ID: <bb8602f1-71f9-438d-91b9-6793250648ea@linuxfoundation.org> (raw)
In-Reply-To: <20240709180829.65e8967d@canb.auug.org.au>
On 7/9/24 02:08, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the kselftest-fixes tree as different
> commits (but the same patches):
>
> 868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
> 7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
> 14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
>
> These are already causing an unnecessary conflict
> :-( Maybe you could just merge the kselftest-fixes tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes),
> but first make sure that it won't be rebased.
>
They are now in Linus's mainline. :)
thanks,
-- Shuah
next prev parent reply other threads:[~2024-07-09 18:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 8:08 linux-next: duplicate patches in the random tree Stephen Rothwell
2024-07-09 13:12 ` Jason A. Donenfeld
2024-07-09 18:09 ` Shuah Khan [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-19 22:13 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=bb8602f1-71f9-438d-91b9-6793250648ea@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--cc=Jason@zx2c4$(echo .)com \
--cc=jhubbard@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shuah@kernel$(echo .)org \
--cc=tytso@mit$(echo .)edu \
/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