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: <427a54c6-f097-f64d-29fb-b90eee504c4b@linuxfoundation.org>
Date:   Wed, 17 May 2023 10:12:49 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: linux-next: duplicate patch in the rcu tree
Content-Language: en-US
To:     paulmck@kernel.org
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Shuah Khan <shuah@kernel.org>, Mark Brown <broonie@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>
References: <20230511090010.2916e9d7@canb.auug.org.au>
 <59c2fd36-6920-47d8-a79c-9ff3fcf7c7ae@paulmck-laptop>
 <96c6fdf7-e589-ca56-9314-1d437b8082ac@linuxfoundation.org>
 <62cabd2d-124f-4bc3-8eb8-36773c10b4f2@paulmck-laptop>
From:   Shuah Khan <skhan@linuxfoundation.org>
In-Reply-To: <62cabd2d-124f-4bc3-8eb8-36773c10b4f2@paulmck-laptop>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/16/23 06:19, Paul E. McKenney wrote:
> On Mon, May 15, 2023 at 01:28:23PM -0600, Shuah Khan wrote:
>> On 5/11/23 10:52, Paul E. McKenney wrote:
>>> On Thu, May 11, 2023 at 09:00:10AM +1000, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> The following commit is also in the kselftest-fixes tree as a different
>>>> commit (but the same patch):
>>>>
>>>>     6d9ed63d8bc3 ("tools/nolibc: Fix build of stdio.h due to header ordering")
>>>>
>>>> This is commit
>>>>
>>>>     d7eafa64a158 ("tools/nolibc: Fix build of stdio.h due to header ordering")
>>>>
>>>> in the kselftest-fixes tree.
>>>
>>> I can currently cleanly remove this commit from the rest of the nolibc
>>> commits in -rcu.
>>>
>>> However, I might need to re-introduce it in some way or another, for
>>> example, if there are dependencies on it by future nolibc patches.
>>> (I expect another batch in a few days.)
>>>
>>> So how would you like to proceed?
>>
>> Paul,
>>
>> I can drop this from linux-kselftest fixes if that is the easier path.
>> Just let me know.
> 
> That would work better for me, less need to keep track of different
> commits in different trees.  So could you please drop this one?
> 

Done. Dropped d7eafa64a158 from linux-kselftest fixes.

thanks,
-- Shuah