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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CABi2SkWkm+NAOsk8UY+C+SfY7b7p4N4=CVkiXdMeNX7cAPwW7A@mail.gmail.com>
Date: Fri, 7 Mar 2025 13:54:34 -0800
From: Jeff Xu <jeffxu@...omium.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Thomas Gleixner <tglx@...utronix.de>, 
	Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Nam Cao <namcao@...utronix.de>, 
	Thomas Weißschuh <thomas.weissschuh@...utronix.de>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree

On Thu, Mar 6, 2025 at 11:58 PM Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> On Fri, 7 Mar 2025 15:14:26 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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