From: Shuah Khan <skhan@linuxfoundation.org>
To: paulmck@kernel.org
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
shuah@kernel.org, Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep"
Date: Tue, 29 Nov 2022 15:24:32 -0700 [thread overview]
Message-ID: <d48804d5-2ad5-fbfb-ce17-83fbc450d3d6@linuxfoundation.org> (raw)
In-Reply-To: <20221129221344.GF4001@paulmck-ThinkPad-P17-Gen-1>
On 11/29/22 15:13, Paul E. McKenney wrote:
> On Tue, Nov 29, 2022 at 02:39:25PM -0700, Shuah Khan wrote:
>> On 11/22/22 19:27, Tiezhu Yang wrote:
>>> It seems that patch #2~#6 has no conflicts with the other related
>>> git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev.
>>>
>>> What should I do?
>>>
>>> Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1?
>>>
>>> And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org.
>>>
>>
>> That won't work because linux-kselftest next won't have the linux-rcu content.
>> I already picked patches 1,2,6
>>
>> Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend
>> just those cc'ing the right people. get_maintainers.pl will give you the info.
>>
>> As for patch 1 - perhaps the conflict could be resolved in next.
>>
>> Paul, would you like me to drop rcutorture patch from linux-kselftest next?
>
> I would be happy to carry the rcutorture patch, especially if doing so
> makes life easier. ;-)
>
> But please do send me some sort of pointer to the patch. Otherwise,
> I guarantee you that I will queue the wrong one.
>
I have it queued up in linux-kselftest next for Linux 6.2-rc1 - if it is easier
we can just resolve the merge in next.
thanks,
-- Shuah
next prev parent reply other threads:[~2022-11-29 22:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 1:03 [PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep" Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 1/6] selftests: rcutorture: " Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 2/6] selftests: ftrace: " Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 3/6] selftests: powerpc: " Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 4/6] selftests: gpio: " Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 5/6] selftests: net: " Tiezhu Yang
2022-11-23 1:03 ` [PATCH v2 6/6] selftests: kselftest_deps: " Tiezhu Yang
2022-11-23 2:27 ` [PATCH v2 0/6] selftests: " Tiezhu Yang
2022-11-29 21:39 ` Shuah Khan
2022-11-29 22:13 ` Paul E. McKenney
2022-11-29 22:24 ` Shuah Khan [this message]
2022-11-29 23:22 ` Paul E. McKenney
2022-11-29 23:30 ` Shuah Khan
2022-11-29 23:58 ` Paul E. McKenney
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=d48804d5-2ad5-fbfb-ce17-83fbc450d3d6@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=shuah@kernel.org \
--cc=yangtiezhu@loongson.cn \
/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