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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250227144817.50618ab7@canb.auug.org.au>
Date: Thu, 27 Feb 2025 14:48:17 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Rik van Riel <riel@...riel.com>,
 Qi Zheng <zhengqi.arch@...edance.com>
Subject: Re: linux-next: duplicate patch in the tip tree

Hi all,

On Thu, 27 Feb 2025 14:44:10 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped