Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/thread_info.h:38, from arch/x86/include/asm/preempt.h:7, from include/linux/preempt.h:78, from include/linux/spinlock.h:51, from include/linux/mmzone.h:8, from include/linux/gfp.h:6, from include/linux/slab.h:15, from include/linux/crypto.h:20, from arch/x86/kernel/asm-offsets.c:9: arch/x86/include/asm/thread_info.h:96: warning: "TIF_NOTIFY_SIGNAL" redefined 96 | #define TIF_NOTIFY_SIGNAL 19 /* signal notifications exist */ | arch/x86/include/asm/thread_info.h:94: note: this is the location of the previous definition 94 | #define TIF_NOTIFY_SIGNAL 17 /* signal notifications exist */ | Caused by commit c8d5ed67936f ("x86: Wire up TIF_NOTIFY_SIGNAL") interacting with commit 323b0fba756d ("x86: wire up TIF_NOTIFY_SIGNAL") from the block tree. I added the following merge fix patch. Please sort out these separate versions of the series ... maybe use a common branch. From: Stephen Rothwell Date: Mon, 9 Nov 2020 14:31:50 +1100 Subject: [PATCH] fix up conflict in "x86: wire up TIF_NOTIFY_SIGNAL" versions Signed-off-by: Stephen Rothwell --- arch/x86/include/asm/thread_info.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index ec0fcbe739ec..414895e923f5 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -93,7 +93,6 @@ struct thread_info { #define TIF_NOTSC 16 /* TSC is not accessible in userland */ #define TIF_NOTIFY_SIGNAL 17 /* signal notifications exist */ #define TIF_SLD 18 /* Restore split lock detection on context switch */ -#define TIF_NOTIFY_SIGNAL 19 /* signal notifications exist */ #define TIF_MEMDIE 20 /* is terminating due to OOM killer */ #define TIF_POLLING_NRFLAG 21 /* idle is polling for TIF_NEED_RESCHED */ #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ -- 2.28.0 -- Cheers, Stephen Rothwell