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

[Andrew Morton]

On Tue, 14 Jul 2026 12:47:57 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> 
>   mm/sparse-vmemmap.c
> 
> between commit:
> 
>   4edd70ee6a7d0 ("mm/sparse-vmemmap: flush_cache_vmap() after hotplugging vmemmap")
> 
> from the risc-v-fixes tree and commit:
> 
>   7605044cea4d2 ("riscv: mm: avoid spurious fault after hotplugging vmemmap")
> 
> from the mm-nonmm-unstable tree.  These appear to be two versions of the
> same fix, it looks like one needs to be chosen - I did the conflict
> resolution picking based on taste but left the non-conflicting bits of
> both changes.

OK, thanks.  I'll remove "riscv: mm: avoid spurious fault after
hotplugging vmemmap" from mm.git.