linux-kernel - linux-next: manual merge of the uml tree with the tip-fixes 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>] [day] [month] [year] [list]

Message-ID: <20251204125841.4fd60214@canb.auug.org.au>
Date: Thu, 4 Dec 2025 12:58:41 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Richard Weinberger <richard@....at>, Thomas Gleixner
 <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>, "H. Peter Anvin"
 <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>
Cc: Johannes Berg <johannes.berg@...el.com>, Josh Poimboeuf
 <jpoimboe@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the uml tree with the tip-fixes tree

Hi all,

Today's linux-next merge of the uml tree got conflicts in:

  arch/x86/um/shared/sysdep/kernel-offsets.h
  arch/um/include/shared/common-offsets.h

between commits:

  a818f28f017b ("x86/alternative: Remove ANNOTATE_DATA_SPECIAL usage")
  f387d0e1027f ("x86/asm: Remove ANNOTATE_DATA_SPECIAL usage")

from the tip-fixes tree and commit:

  6e3fc802ab86 ("um: move asm-offsets generation into a single file")

from the uml tree.

I fixed it up (I removed the 2 files above and then applied the following
patch) 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.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 4 Dec 2025 12:55:21 +1100
Subject: [PATCH] fix up for "um: move asm-offsets generation into a single file"

interacting with commits

  a818f28f017b ("x86/alternative: Remove ANNOTATE_DATA_SPECIAL usage")
  f387d0e1027f ("x86/asm: Remove ANNOTATE_DATA_SPECIAL usage")

from the tip-fixes tree.

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 arch/um/kernel/asm-offsets.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c
index d38447e39d5e..caf94725e19c 100644
--- a/arch/um/kernel/asm-offsets.c
+++ b/arch/um/kernel/asm-offsets.c
@@ -9,6 +9,7 @@
 #include <linux/fs.h>
 #include <asm/mman.h>
 #include <asm/seccomp.h>
+#include <asm/extable.h>

 /* workaround for a warning with -Wmissing-prototypes */
 void foo(void);
@@ -33,6 +34,9 @@ void foo(void)

 	DEFINE(UM_SECCOMP_ARCH_NATIVE, SECCOMP_ARCH_NATIVE);

+	DEFINE(ALT_INSTR_SIZE, sizeof(struct alt_instr));
+	DEFINE(EXTABLE_SIZE,   sizeof(struct exception_table_entry));
+
 	DEFINE(HOSTFS_ATTR_MODE, ATTR_MODE);
 	DEFINE(HOSTFS_ATTR_UID, ATTR_UID);
 	DEFINE(HOSTFS_ATTR_GID, ATTR_GID);
-- 
2.52.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped