Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d48804d5-2ad5-fbfb-ce17-83fbc450d3d6@linuxfoundation.org>
Date:   Tue, 29 Nov 2022 15:24:32 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep"
Content-Language: en-US
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>
References: <1669165413-12035-1-git-send-email-yangtiezhu@loongson.cn>
 <bf9b26b5-2793-204f-ba9c-4d9cd55b08ad@loongson.cn>
 <dc7cb519-584c-55f1-4baa-44cd4e0bbfe9@linuxfoundation.org>
 <20221129221344.GF4001@paulmck-ThinkPad-P17-Gen-1>
From:   Shuah Khan <skhan@linuxfoundation.org>
In-Reply-To: <20221129221344.GF4001@paulmck-ThinkPad-P17-Gen-1>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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