linux-next: duplicate patch in the tip tree

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  379af13b31fa ("docs: locking: Discourage from calling disable_irq() in atomic")

This is commit

  ac6fadf4aa60 ("docs: kernel-hacking: discourage from calling disable_irq() in atomic")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   379af13b31fa ("docs: locking: Discourage from calling disable_irq() in atomic")
>
> This is commit
>
>   ac6fadf4aa60 ("docs: kernel-hacking: discourage from calling disable_irq() in atomic")
>
> in the jc_docs tree.

I'm sure I checked before applying that ... I guess maybe not.  I've
disappeared it now, thanks.

jon

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

[Stephen Rothwell]

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

Hi Jon,

On Fri, 13 Jan 2023 09:27:38 -0700 Jonathan Corbet <corbet@lwn.net> wrote:
>
> I'm sure I checked before applying that ... I guess maybe not.  I've
> disappeared it now, thanks.

You may well have checked, both commits appeared in linux-next for the
first time yesterday.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  b7a7ce1bb77b ("vdso/timens: Always provide arch_get_vdso_data() prototype for vdso")

This is commit

  0361c2513d36 ("time_namespace: always provide arch_get_vdso_data() prototype for vdso")

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 tip tree

[Andrew Morton]

On Fri, 2 Jun 2023 13:04:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>   b7a7ce1bb77b ("vdso/timens: Always provide arch_get_vdso_data() prototype for vdso")
> 
> This is commit
> 
>   0361c2513d36 ("time_namespace: always provide arch_get_vdso_data() prototype for vdso")
> 
> in the mm tree.

Thanks.  I think I'll leave things as-is - both trees want the patch.

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")

This is commit

  73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")
>
> This is commit
>
>   73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")
>
> in the jc_docs tree.

Hmm...I thought I even checked for that.  No worries, I can drop my
copy.

Thanks,

jon

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

[Ingo Molnar]

* Jonathan Corbet <corbet@lwn.net> wrote:

> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Hi all,
> >
> > The following commit is also in the jc_docs tree as a different commit
> > (but the same patch):
> >
> >   c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")
> >
> > This is commit
> >
> >   73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")
> >
> > in the jc_docs tree.
> 
> Hmm...I thought I even checked for that.  No worries, I can drop my
> copy.

I'm pretty sure it was me who added the duplicate - sorry about that!

Thanks,

	Ingo

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  e0a1284b293b ("time/kunit: Use correct format specifier")

This is commit

  133e267ef4a2 ("time: test: Fix incorrect format specifier")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  6b9ccbc033cf ("kthread: Fix task state in kthread worker if being frozen")

This is commit

  e16c7b07784f ("kthread: fix task state in kthread worker if being frozen")

in the mm-nonmm-stable branch of the mm tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  9c70b2a33cd2 ("sched/numa: Fix the potential null pointer dereference in task_numa_work()")

This is commit

  82c4d6b6dace ("sched/numa: fix the potential null pointer dereference in task_numa_work()")

in the mm-hotfixes-unstable branch of the mm-hotfixes tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Andrew Morton]

On Tue, 29 Oct 2024 13:34:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commit is also in the mm-hotfixes tree as a different commit
> (but the same patch):
> 
>   9c70b2a33cd2 ("sched/numa: Fix the potential null pointer dereference in task_numa_work()")
> 
> This is commit
> 
>   82c4d6b6dace ("sched/numa: fix the potential null pointer dereference in task_numa_work()")
> 
> in the mm-hotfixes-unstable branch of the mm-hotfixes tree.

Thanks, but...  What tip branch is it in?  Matters because: is that
branch destined for 6.12.x?

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

[Stephen Rothwell]

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

Hi Andrew,

On Mon, 28 Oct 2024 21:30:40 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Tue, 29 Oct 2024 13:34:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > The following commit is also in the mm-hotfixes tree as a different commit
> > (but the same patch):
> > 
> >   9c70b2a33cd2 ("sched/numa: Fix the potential null pointer dereference in task_numa_work()")
> > 
> > This is commit
> > 
> >   82c4d6b6dace ("sched/numa: fix the potential null pointer dereference in task_numa_work()")
> > 
> > in the mm-hotfixes-unstable branch of the mm-hotfixes tree.  
> 
> Thanks, but...  What tip branch is it in?  Matters because: is that
> branch destined for 6.12.x?

Its in the sched/urgent branch, so probably destined for Linus fairly
soon.  But the tip guys would know better than I.

-- 
Cheers,
Stephen Rothwell

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

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

[Thomas Gleixner]

On Tue, Oct 29 2024 at 17:05, Stephen Rothwell wrote:
> On Mon, 28 Oct 2024 21:30:40 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>> > This is commit
>> > 
>> >   82c4d6b6dace ("sched/numa: fix the potential null pointer dereference in task_numa_work()")
>> > 
>> > in the mm-hotfixes-unstable branch of the mm-hotfixes tree.  
>> 
>> Thanks, but...  What tip branch is it in?  Matters because: is that
>> branch destined for 6.12.x?
>
> Its in the sched/urgent branch, so probably destined for Linus fairly
> soon.  But the tip guys would know better than I.

Yes, .../urgent are fixes for the current -rc cycle. That should go end
of the week to Linus.

Thanks,

        tglx

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

[Peter Zijlstra]

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

On Tue, Oct 29, 2024 at 05:05:33PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Mon, 28 Oct 2024 21:30:40 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Tue, 29 Oct 2024 13:34:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > The following commit is also in the mm-hotfixes tree as a different commit
> > > (but the same patch):
> > > 
> > >   9c70b2a33cd2 ("sched/numa: Fix the potential null pointer dereference in task_numa_work()")
> > > 
> > > This is commit
> > > 
> > >   82c4d6b6dace ("sched/numa: fix the potential null pointer dereference in task_numa_work()")
> > > 
> > > in the mm-hotfixes-unstable branch of the mm-hotfixes tree.  
> > 
> > Thanks, but...  What tip branch is it in?  Matters because: is that
> > branch destined for 6.12.x?
> 
> Its in the sched/urgent branch, so probably destined for Linus fairly
> soon.  But the tip guys would know better than I.

Yeah, tip/sched/urgent, which is supposed to go to Linus on Sunday
before he cuts the next -rc or so.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  03a001b156d2 ("mm: introduce mmap_lock_speculate_{try_begin|retry}")

That is commit

  6f030e32e449 ("mm: introduce mmap_lock_speculate_{try_begin|retry}")

in the mm-stable tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  a37259732a7d ("x86/mm: Make MMU_GATHER_RCU_TABLE_FREE unconditional")

This is commit

  a30104ede395 ("x86/mm: make MMU_GATHER_RCU_TABLE_FREE unconditional")

in the mm-unstable branch of the mm tree.

This is already causing a conflct in arch/x86/kernel/paravirt.c due commit

  f2c5c2105827 ("x86/mm: Remove pv_ops.mmu.tlb_remove_table call")

in the tip tree (where I just used the tip tree version).

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Thu, 27 Feb 2025 14:44:10 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>   a37259732a7d ("x86/mm: Make MMU_GATHER_RCU_TABLE_FREE unconditional")
> 
> This is commit
> 
>   a30104ede395 ("x86/mm: make MMU_GATHER_RCU_TABLE_FREE unconditional")
> 
> in the mm-unstable branch of the mm tree.
> 
> This is already causing a conflct in arch/x86/kernel/paravirt.c due commit
> 
>   f2c5c2105827 ("x86/mm: Remove pv_ops.mmu.tlb_remove_table call")
> 
> in the tip tree (where I just used the tip tree version).

And another in arch/x86/mm/pgtable.c due to commit

  530c12f84d2c ("x86: pgtable: convert to use tlb_remove_ptdesc()")

in the tip tree (where I again just used the tip tree version).

-- 
Cheers,
Stephen Rothwell

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

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

[Andrew Morton]

On Thu, 27 Feb 2025 14:48:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> On Thu, 27 Feb 2025 14:44:10 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > The following commit is also in the mm tree as a different commit (but
> > the same patch):
> > 
> >   a37259732a7d ("x86/mm: Make MMU_GATHER_RCU_TABLE_FREE unconditional")
> > 
> > This is commit
> > 
> >   a30104ede395 ("x86/mm: make MMU_GATHER_RCU_TABLE_FREE unconditional")
> > 
> > in the mm-unstable branch of the mm tree.
> > 
> > This is already causing a conflct in arch/x86/kernel/paravirt.c due commit
> > 
> >   f2c5c2105827 ("x86/mm: Remove pv_ops.mmu.tlb_remove_table call")
> > 
> > in the tip tree (where I just used the tip tree version).

yes, I duplicated that match in mm.git so it can carry the series
"remove tlb_remove_page_ptdesc()".

> And another in arch/x86/mm/pgtable.c due to commit
> 
>   530c12f84d2c ("x86: pgtable: convert to use tlb_remove_ptdesc()")
> 
> in the tip tree (where I again just used the tip tree version).

Really, I'd mildly prefer that subsystem maintainers not cherrypick
patches from the middle of a series.  An acked-by would be preferred.

I can understand the desire to test a patch within the subsystem's
tree, but that can (should?) be done by testing linux-next overall.

Whatever.  I'll retain "x86: pgtable: convert to use
tlb_remove_ptdesc()" and shall figure it out within the merge window.

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  73989a38268d ("ARM: orion/gpio:: Convert generic irqchip locking to guard()")

This is commit

  5b49e7ff76b7 ("ARM: orion/gpio:: Convert generic irqchip locking to guard()")

in the mvebu tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Gregory CLEMENT]

Hi Stephen,

> Hi all,
>
> The following commit is also in the mvebu tree as a different commit
> (but the same patch):
>
>   73989a38268d ("ARM: orion/gpio:: Convert generic irqchip locking to guard()")
>
> This is commit
>
>   5b49e7ff76b7 ("ARM: orion/gpio:: Convert generic irqchip locking to guard()")
>
> in the mvebu tree.


Thank you for the notice. I will remove the commit from my branch now. I
didn't realize it had already been merged.

Thanks,

Gregpry

>
> -- 
> Cheers,
> Stephen Rothwell

-- 
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  48199713a6a8 ("um: Use irq_domain_create_linear() helper")

This is commit

  7633b8b1e793 ("irqdomain: um: use irq_domain_create_linear() helper")

in the uml tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Thomas Gleixner]

On Wed, May 07 2025 at 13:22, Stephen Rothwell wrote:
> The following commit is also in the uml tree as a different commit
> (but the same patch):
>
>   48199713a6a8 ("um: Use irq_domain_create_linear() helper")
>
> This is commit
>
>   7633b8b1e793 ("irqdomain: um: use irq_domain_create_linear() helper")
>
> in the uml tree.

I zapped it from the irq/cleanups branch, which is the sink for all
irqdomain cleanup patches which have not shown up in next.

Thanks,

        tglx

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

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commit is also in the uml tree as a different commit
> (but the same patch):
> 
>   48199713a6a8 ("um: Use irq_domain_create_linear() helper")
> 
> This is commit
> 
>   7633b8b1e793 ("irqdomain: um: use irq_domain_create_linear() helper")
> 
> in the uml tree.

The -tip version (48199713a6a8) has gone away now that it was picked up 
by the maintainer, so this should all be resolved in tomorrow's -next.

Thanks,

	Ingo

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  3e816361e94a ("sched/tracepoints: Move and extend the sched_process_exit() tracepoint")

This is commit

  594ce0161914 ("exit: move and extend sched_process_exit() tracepoint")

in the mm-nonmm-unstable tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  f339770f60d9 ("Revert "sched/numa: add statistics of numa balance task"")

This is commit

  63afea878dc4 ("Revert "sched/numa: add statistics of numa balance task"")

in the mm-hotfixes tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Andrew Morton]

On Tue, 8 Jul 2025 16:00:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commit is also in the mm-hotfixes tree as a different commit
> (but the same patch):
> 
>   f339770f60d9 ("Revert "sched/numa: add statistics of numa balance task"")
> 
> This is commit
> 
>   63afea878dc4 ("Revert "sched/numa: add statistics of numa balance task"")
> 
> in the mm-hotfixes tree.

Thanks, I'll drop the mm.git copy.

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

[Borislav Petkov]

On Mon, Jul 07, 2025 at 11:48:17PM -0700, Andrew Morton wrote:
> On Tue, 8 Jul 2025 16:00:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > The following commit is also in the mm-hotfixes tree as a different commit
> > (but the same patch):
> > 
> >   f339770f60d9 ("Revert "sched/numa: add statistics of numa balance task"")
> > 
> > This is commit
> > 
> >   63afea878dc4 ("Revert "sched/numa: add statistics of numa balance task"")
> > 
> > in the mm-hotfixes tree.
> 
> Thanks, I'll drop the mm.git copy.

So we actually started adding it to tip for the time being until you send it
to Linus so that our testing doesn't fail - it was reproducing reliably on my
test machines.

So can you pls send it to Linus so that we can drop it from tip?

Thx. 

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

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

[Andrew Morton]

On Wed, 9 Jul 2025 11:17:02 +0200 Borislav Petkov <bp@alien8.de> wrote:

> > > 
> > > The following commit is also in the mm-hotfixes tree as a different commit
> > > (but the same patch):
> > > 
> > >   f339770f60d9 ("Revert "sched/numa: add statistics of numa balance task"")
> > > 
> > > This is commit
> > > 
> > >   63afea878dc4 ("Revert "sched/numa: add statistics of numa balance task"")
> > > 
> > > in the mm-hotfixes tree.
> > 
> > Thanks, I'll drop the mm.git copy.
> 
> So we actually started adding it to tip for the time being until you send it
> to Linus so that our testing doesn't fail - it was reproducing reliably on my
> test machines.

Ah, OK.

> So can you pls send it to Linus so that we can drop it from tip?

Yup.  Tomorrow seems likely.

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

[Borislav Petkov]

On Wed, Jul 09, 2025 at 12:12:03PM -0700, Andrew Morton wrote:
> > So can you pls send it to Linus so that we can drop it from tip?
> 
> Yup.  Tomorrow seems likely.

Cool. I'll drop it once it lands in his tree and we should be good.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette