linux-kernel - Re: linux-next: manual merge of the mm-stable tree with the mm-hotfixes 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] [day] [month] [year] [list]

Message-Id: <20250925112640.573c99e5bab74dc36b18fd75@linux-foundation.org>
Date: Thu, 25 Sep 2025 11:26:40 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Mark Brown <broonie@...nel.org>
Cc: Alexandre Ghiti <alexghiti@...osinc.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Paul Walmsley <pjw@...nel.org>
Subject: Re: linux-next: manual merge of the mm-stable tree with the
 mm-hotfixes tree

On Thu, 25 Sep 2025 13:59:06 +0100 Mark Brown <broonie@...nel.org> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-stable tree got a conflict in:
> 
>   arch/riscv/include/asm/pgtable.h
> 
> between commit:
> 
>   668208b161a0b ("riscv: use an atomic xchg in pudp_huge_get_and_clear()")
> 
> from the mm-hotfixes tree and commit:

This is in the mm-stable tree.

>   546e42c8c6d94 ("riscv: Use an atomic xchg in pudp_huge_get_and_clear()")
> 
> from the mm-stable tree.

And this will be from a riscv tree, I assume.

> I fixed it up (see below) and can carry the fix as necessary.

Please just take the version from the riscv tree.