Re: linux-next: manual merge of the risc-v tree with the mm tree

[Andrew Morton]

On Mon, 12 Oct 2026 16:59:22 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   arch/riscv/mm/init.c
> 
> between commit:
> 
>   f02f1d1437449 ("riscv/mm: fix hotplug page-table destructor handling")
> 
> from the mm tree and commit:
> 
>   79113093e9dc3 ("riscv: convert pgtable_l4|l5_enabled to inline function")
> 
> from the risc-v tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks.

> diff --combined arch/riscv/mm/init.c
> index 6f6b04795bb23,e2b738ca90cf3..0000000000000
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c

Well that's ugly.

I'll disable "riscv/mm: fix hotplug page-table destructor handling" for
now to make this go away.

A decent approach would be to add that patch via the riscv tree.  Muchun,
please confirm that this has no dependencies on anything else?

Otherwise I'll leave it disabled and revisit after -rc1.