The quilt patch titled Subject: um: disable KASAN_INLINE when STATIC_LINK is selected has been removed from the -mm tree. Its filename was um-disable-kasan_inline-when-static_link-is-selected.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------ From: "Christophe Leroy (CS GROUP)" chleroy@kernel.org Subject: um: disable KASAN_INLINE when STATIC_LINK is selected Date: Sat, 29 Nov 2025 10:56:02 +0100
um doesn't support KASAN_INLINE together with STATIC_LINK.
Instead of failing the build, disable KASAN_INLINE when STATIC_LINK is selected.
Link: https://lkml.kernel.org/r/2620ab0bbba640b6237c50b9c0dca1c7d1142f5d.176441006... Fixes: 1e338f4d99e6 ("kasan: introduce ARCH_DEFER_KASAN and unify static key across modes") Signed-off-by: Christophe Leroy (CS GROUP) chleroy@kernel.org Reported-by: kernel test robot lkp@intel.com Closes: https://lore.kernel.org/oe-kbuild-all/202511290451.x9GZVJ1l-lkp@intel.com/ Cc: Alexander Potapenko glider@google.com Cc: Andrey Konovalov andreyknvl@gmail.com Cc: Andrey Ryabinin ryabinin.a.a@gmail.com Cc: Anton Ivanov anton.ivanov@cambridgegreys.com Cc: Dmitriy Vyukov dvyukov@google.com Cc: Johannes Berg johannes@sipsolutions.net Cc: Richard Weinberger richard@nod.at Cc: "Ritesh Harjani (IBM)" ritesh.list@gmail.com Cc: Sabyrzhan Tasbolatov snovitoll@gmail.com Cc: Vincenzo Frascino vincenzo.frascino@arm.com Cc: stable@vger.kernel.org Signed-off-by: Andrew Morton akpm@linux-foundation.org ---
arch/um/Kconfig | 1 + arch/um/include/asm/kasan.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
--- a/arch/um/include/asm/kasan.h~um-disable-kasan_inline-when-static_link-is-selected +++ a/arch/um/include/asm/kasan.h @@ -24,10 +24,6 @@
#ifdef CONFIG_KASAN void kasan_init(void); - -#if defined(CONFIG_STATIC_LINK) && defined(CONFIG_KASAN_INLINE) -#error UML does not work in KASAN_INLINE mode with STATIC_LINK enabled! -#endif #else static inline void kasan_init(void) { } #endif /* CONFIG_KASAN */ --- a/arch/um/Kconfig~um-disable-kasan_inline-when-static_link-is-selected +++ a/arch/um/Kconfig @@ -5,6 +5,7 @@ menu "UML-specific options" config UML bool default y + select ARCH_DISABLE_KASAN_INLINE if STATIC_LINK select ARCH_NEEDS_DEFER_KASAN if STATIC_LINK select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_HAS_CACHE_LINE_SIZE _
Patches currently in -mm which might be from chleroy@kernel.org are