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

[Jeff Xu]

On Thu, Mar 6, 2025 at 11:58 PM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Fri, 7 Mar 2025 15:14:26 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> >   arch/arm64/kernel/vdso.c
> >
> > between commit:
> >
> >   6742f72d084b ("mseal sysmap: enable arm64")
> >
> > from the mm tree and commit:
> >
> >   0b3bc3354eb9 ("arm64: vdso: Switch to generic storage implementation")
> >
> > from the tip tree.
> >
> > I didn't fix it up - couldn't figure it out, so just reverted the former
> > for today as it was simpler.
> >
> > It looks like VM_SEALED_SYSMAP needs to be added to
> > vdso_install_vvar_mapping(), but that is generic across all the
> > architectures using GENERIC_VDSO_DATA_STORE.
> >
> > and we have the same between commit
> >
> >   035f34159d61 ("mseal sysmap: enable x86-64")
> >
> > from the mm tre and commit
> >
> >   dafde29605eb ("x86/vdso: Switch to generic storage implementation")
> >
> > So I have reverted 035f34159d61 as well.
>
> Thanks.
>
> How about this?  I scooped Thomas's series into mm.git and merged
> Peter's mseal series on top.  I'll sort this out during the merge
> window, after the tip tree has merged.
>
> Pushed out now.  Peter, please check my handiwork.

In case this helps, I checked mm-unstable and the merge looks good to
me, thanks Andrew !

-Jeff