[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <dc7cb519-584c-55f1-4baa-44cd4e0bbfe9@linuxfoundation.org>
Date: Tue, 29 Nov 2022 14:39:25 -0700
From: Shuah Khan <skhan@...uxfoundation.org>
To: Tiezhu Yang <yangtiezhu@...ngson.cn>,
"Paul E. McKenney" <paulmck@...nel.org>
Cc: linux-kernel@...r.kernel.org, linux-kselftest@...r.kernel.org,
shuah@...nel.org, Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: [PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep"
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@...r.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?
thanks,
-- Shuah
Powered by blists - more mailing lists