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

["Lorenzo Stoakes (ARM)" <ljs@kernel.org>]

On Wed, Oct 21, 2026 at 04:44:36PM +0200, Magnus Lindholm wrote:
> Hi Mark,
>
> On Wed, Oct 21, 2026 at 3:42 PM Mark Brown <broonie@kernel.org> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the mm tree got a conflict in:
> >
> >   arch/alpha/Kconfig
> >
> > between commit:
> >
> >   0d4c9dd06c364 ("alpha: select SPARSE_IRQ")
> >
> > from the origin tree and commit:
> >
> >   35e340a47888e ("mm: userland pgtable freeing is RCU-safe now, remove leftover bits")
> >
> > from the mm 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.
> >
> > diff --cc arch/alpha/Kconfig
> > index 8fafbfabd1e51,9063c7bda4e41..0000000000000
> > --- a/arch/alpha/Kconfig
> > +++ b/arch/alpha/Kconfig
> > @@@ -71,10 -42,7 +71,9 @@@ config ALPH
> >         select ARCH_STACKWALK
> >         select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67
> >         select MMU_GATHER_NO_RANGE
> > -       select MMU_GATHER_RCU_TABLE_FREE
> >  +      select SPARSE_IRQ
> >         select SPARSEMEM_EXTREME if SPARSEMEM
> >  +      select SYSCTL_EXCEPTION_TRACE
> >         select ZONE_DMA
> >         select TRACE_IRQFLAGS_SUPPORT
> >         select ARCH_WANT_FRAME_POINTERS
>
> The resolution looks correct to me. Thanks for resolving this.

Ack agreed, thanks!

>
> Regards,
>
> Magnus

--
Cheers, Lorenzo