Subject: Re: linux-next: manual merge of the mm-stable tree with the mm-hotfixes tree

From: Andrew Morton <[email-masked]>
Date: Thu, 25 Sep 2025 11:26:40 -0700

On Thu, 25 Sep 2025 13:59:06 +0100 Mark Brown <[email-masked]> 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.