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@canb.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@canb.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