linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20250307151426.5f3c0c39@canb.auug.org.au>
Date: Fri, 7 Mar 2025 15:14:26 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: Jeff Xu <jeffxu@...omium.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: linux-next: manual merge of the tip tree with the mm tree

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped