2023-05-10 23:17:58

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patch in the rcu tree

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.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-05-11 17:01:32

by Paul E. McKenney

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

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?

Thanx, Paul

2023-05-15 19:46:04

by Shuah Khan

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

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.

thanks,
-- Shuah


2023-05-16 12:50:43

by Paul E. McKenney

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

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?

Thanx, Paul

2023-05-17 16:19:16

by Shuah Khan

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

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


2023-05-17 17:18:29

by Paul E. McKenney

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

On Wed, May 17, 2023 at 10:12:49AM -0600, Shuah Khan wrote:
> 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.

Thank you, Shuah!

Thanx, Paul

2023-07-14 05:03:17

by Paul E. McKenney

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

On Fri, Jul 14, 2023 at 02:43:30PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in net-next tree as a different commit
> (but the same patch):
>
> a2b38823280d ("rcu: Export rcu_request_urgent_qs_task()")
>
> This is commit
>
> 43a89baecfe2 ("rcu: Export rcu_request_urgent_qs_task()")
>
> in the net-next tree.

The net-next tree needs it for BPF, correct? So if you guys intend to
push it to mainline, I will be happy to drop if from -rcu.

Either way, please let me know!

Thanx, Paul

2023-07-14 06:13:12

by Alexei Starovoitov

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

On Thu, Jul 13, 2023 at 9:50 PM Paul E. McKenney <[email protected]> wrote:
>
> On Fri, Jul 14, 2023 at 02:43:30PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commit is also in net-next tree as a different commit
> > (but the same patch):
> >
> > a2b38823280d ("rcu: Export rcu_request_urgent_qs_task()")
> >
> > This is commit
> >
> > 43a89baecfe2 ("rcu: Export rcu_request_urgent_qs_task()")
> >
> > in the net-next tree.
>
> The net-next tree needs it for BPF, correct?

yes.

> So if you guys intend to
> push it to mainline, I will be happy to drop if from -rcu.

That's the intent. Please drop it from -rcu.
Thank you!

2023-07-14 15:37:50

by Paul E. McKenney

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the rcu tree

On Thu, Jul 13, 2023 at 11:04:11PM -0700, Alexei Starovoitov wrote:
> On Thu, Jul 13, 2023 at 9:50 PM Paul E. McKenney <[email protected]> wrote:
> >
> > On Fri, Jul 14, 2023 at 02:43:30PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > The following commit is also in net-next tree as a different commit
> > > (but the same patch):
> > >
> > > a2b38823280d ("rcu: Export rcu_request_urgent_qs_task()")
> > >
> > > This is commit
> > >
> > > 43a89baecfe2 ("rcu: Export rcu_request_urgent_qs_task()")
> > >
> > > in the net-next tree.
> >
> > The net-next tree needs it for BPF, correct?
>
> yes.
>
> > So if you guys intend to
> > push it to mainline, I will be happy to drop if from -rcu.
>
> That's the intent. Please drop it from -rcu.

Very good, it goes on my next rebase later today, Pacific Time.

Thanx, Paul