linux-next: duplicate patch in the rcu tree

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Hi all,

The following commit is also in the tip tree as a different commit
(but the same patch):

  8bf4aa582b16 ("x86/nmi: Fix out-of-order nesting checks")

This is commit

  f44075ecafb7 ("x86/nmi: Fix out-of-order NMI nesting checks & false positive warning")

in the tip tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Fri, Oct 13, 2023 at 03:37:30PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the tip tree as a different commit
> (but the same patch):
> 
>   8bf4aa582b16 ("x86/nmi: Fix out-of-order nesting checks")
> 
> This is commit
> 
>   f44075ecafb7 ("x86/nmi: Fix out-of-order NMI nesting checks & false positive warning")
> 
> in the tip tree.

I will remove it from -rcu, thank you both!

							Thanx, Paul

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Wed, Feb 28, 2024 at 02:17:05AM +0100, Thomas Gleixner wrote:
> On Wed, Feb 28 2024 at 12:06, Stephen Rothwell wrote:
> > The following commit is also in the tip tree as a different commit
> > (but the same patch):
> >
> >   020eee167cca ("x86/nmi: Fix "in NMI handler" check")
> >
> > This is commit
> >
> >   d54e56f31a34 ("x86/nmi: Fix the inverse "in NMI handler" check")
> >
> > in the tip tree.
> 
> And why the heck is the RCU tree carrying x86 specific stuff which has
> absolutely nothing to do with RCU?
> 
> Just because, right?

So I could test it.

In the future, I will keep such commits out of the portion of -rcu that
is sent to -next.  Apologies for slipping up this time.

							Thanx, Paul

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Wed, Feb 28, 2024 at 12:06:10PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the tip tree as a different commit
> (but the same patch):
> 
>   020eee167cca ("x86/nmi: Fix "in NMI handler" check")
> 
> This is commit
> 
>   d54e56f31a34 ("x86/nmi: Fix the inverse "in NMI handler" check")
> 
> in the tip tree.

Earlier today, I pulled it out of the range of -rcu patches that are
sent to -next.  If overnight testing goes well, you will not see the
copy from -rcu starting tomorrow.

Thank you for calling it out, though!

							Thanx, Paul

Re: linux-next: duplicate patch in the rcu tree

[Thomas Gleixner]

On Wed, Feb 28 2024 at 12:06, Stephen Rothwell wrote:
> The following commit is also in the tip tree as a different commit
> (but the same patch):
>
>   020eee167cca ("x86/nmi: Fix "in NMI handler" check")
>
> This is commit
>
>   d54e56f31a34 ("x86/nmi: Fix the inverse "in NMI handler" check")
>
> in the tip tree.

And why the heck is the RCU tree carrying x86 specific stuff which has
absolutely nothing to do with RCU?

Just because, right?

Thanks,

        tglx

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

Hi all,

The following commit is also in the tip tree as a different commit
(but the same patch):

  020eee167cca ("x86/nmi: Fix "in NMI handler" check")

This is commit

  d54e56f31a34 ("x86/nmi: Fix the inverse "in NMI handler" check")

in the tip tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Wed, Nov 01, 2023 at 12:01:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
> 
>   8a77f38bcd28 ("srcu: Only accelerate on enqueue time")
> 
> This is commit
> 
>   1bb2b7de033a ("srcu: Only accelerate on enqueue time")
> 
> in the rcu tree.

That was me being one version behind Frederic's tree.  I updated, and
apologies for the hassle!

							Thanx, Paul

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  8a77f38bcd28 ("srcu: Only accelerate on enqueue time")

This is commit

  1bb2b7de033a ("srcu: Only accelerate on enqueue time")

in the rcu tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

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 <paulmck@kernel.org> 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

Re: linux-next: duplicate patch in the rcu tree

[Alexei Starovoitov]

On Thu, Jul 13, 2023 at 9:50 PM Paul E. McKenney <paulmck@kernel.org> 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!

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

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

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

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

Re: linux-next: duplicate patch in the rcu tree

[Shuah Khan]

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

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

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

Re: linux-next: duplicate patch in the rcu tree

[Shuah Khan]

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

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

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

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Thu, Mar 23, 2023 at 12:41:35PM -0700, Andrew Morton wrote:
> On Wed, 22 Mar 2023 22:11:12 -0700 "Paul E. McKenney" <paulmck@kernel.org> wrote:
> 
> > >   ce5e77e7b2cc ("instrumented.h: fix all kernel-doc format warnings")
> > > 
> > > in the mm tree)
> > 
> > Andrew, do you want to keep this one, or would you rather that I carry it?
> 
> I dropped my copy, thanks.

Thank you!

							Thanx, Paul

Re: linux-next: duplicate patch in the rcu tree

[Andrew Morton]

On Wed, 22 Mar 2023 22:11:12 -0700 "Paul E. McKenney" <paulmck@kernel.org> wrote:

> >   ce5e77e7b2cc ("instrumented.h: fix all kernel-doc format warnings")
> > 
> > in the mm tree)
> 
> Andrew, do you want to keep this one, or would you rather that I carry it?

I dropped my copy, thanks.

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Thu, Mar 23, 2023 at 02:44:11PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>   d70e2ecbc726 ("instrumented.h: Fix all kernel-doc format warnings")
> 
> This is commit
> 
> in the mm tree
> 
>   fa7596e30b4f ("instrumented.h: fix all kernel-doc format warnings")
> 
> (and tommorow it will be commit
> 
>   ce5e77e7b2cc ("instrumented.h: fix all kernel-doc format warnings")
> 
> in the mm tree)

Andrew, do you want to keep this one, or would you rather that I carry it?

I am good either way.

							Thanx, Paul

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

Hi all,

The following commit is also in the tip tree as a different commit
(but the same patch):

  f339c76cfe29 ("entry/rcu: Check TIF_RESCHED _after_ delayed RCU wake-up")

This is commit

  b41651405481 ("entry/rcu: Check TIF_RESCHED _after_ delayed RCU wake-up")

in the tip tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

Hi all,

The following commit is also in the mm tree as a different commit (but
the same patch):

  d70e2ecbc726 ("instrumented.h: Fix all kernel-doc format warnings")

This is commit

in the mm tree

  fa7596e30b4f ("instrumented.h: fix all kernel-doc format warnings")

(and tommorow it will be commit

  ce5e77e7b2cc ("instrumented.h: fix all kernel-doc format warnings")

in the mm tree)

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Mon, Jan 16, 2023 at 12:38:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the tip tree as a different commit
> (but the same patch):
> 
>   836dc5db1d87 ("context_tracking: Use arch_atomic_*() in __ct_user_enter and __ct_user_exit")
> 
> It is commit
> 
>   0e26e1de0032 ("context_tracking: Fix noinstr vs KASAN")
> 
> in the tip tree.

Plus I have yet another copy in the -rcu tree.  I will drop it on my
next rebase.

							Thanx, Paul

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Mon, Jan 16, 2023 at 12:31:51PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 9 Jan 2023 10:11:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > The following commit is also in the dlm tree as a different commit
> > (but the same patch):
> > 
> >   2674cc2403f8 ("fs/dlm: Remove "select SRCU"")
> 
> This is now commit 7d470a3572f9 in the rcu tree ...

I have added this to my list to drop on my next rebase.  Not sure what
happened on the previous rebases.

							Thanx, Paul

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

Hi all,

The following commit is also in the tip tree as a different commit
(but the same patch):

  836dc5db1d87 ("context_tracking: Use arch_atomic_*() in __ct_user_enter and __ct_user_exit")

It is commit

  0e26e1de0032 ("context_tracking: Fix noinstr vs KASAN")

in the tip tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

Hi all,

On Mon, 9 Jan 2023 10:11:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commit is also in the dlm tree as a different commit
> (but the same patch):
> 
>   2674cc2403f8 ("fs/dlm: Remove "select SRCU"")

This is now commit 7d470a3572f9 in the rcu tree ...
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the rcu tree

[Paul E. McKenney]

On Mon, Jan 09, 2023 at 10:11:17AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the dlm tree as a different commit
> (but the same patch):
> 
>   2674cc2403f8 ("fs/dlm: Remove "select SRCU"")

Thank you!  I will drop it on my next rebase.

							Thanx, Paul

linux-next: duplicate patch in the rcu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

Hi all,

The following commit is also in the dlm tree as a different commit
(but the same patch):

  2674cc2403f8 ("fs/dlm: Remove "select SRCU"")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]