2024-02-28 01:06:41

by Stephen Rothwell

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

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


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

2024-02-28 01:17:19

by Thomas Gleixner

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

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

2024-02-28 01:21:44

by Paul E. McKenney

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

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

2024-02-28 01:27:06

by Paul E. McKenney

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

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