The patch titled Subject: kasan-remove-redundant-config-option-fix has been added to the -mm tree. Its filename is kasan-remove-redundant-config-option-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/kasan-remove-redundant-config-option-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/kasan-remove-redundant-config-option-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: kasan-remove-redundant-config-option-fix fix merge snafu Cc: Alexander Potapenko <glider@xxxxxxxxxx> Cc: Andrey Konovalov <andreyknvl@xxxxxxxxxx> Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx> Cc: Nathan Chancellor <natechancellor@xxxxxxxxx> Cc: Walter Wu <walter-zh.wu@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/Kconfig.kasan | 6 ------ 1 file changed, 6 deletions(-) --- a/lib/Kconfig.kasan~kasan-remove-redundant-config-option-fix +++ a/lib/Kconfig.kasan @@ -155,12 +155,6 @@ config KASAN_STACK CONFIG_COMPILE_TEST. On gcc it is assumed to always be safe to use and enabled by default. -config KASAN_STACK - bool - depends on KASAN_GENERIC || KASAN_SW_TAGS - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC - default 0 - config KASAN_SW_TAGS_IDENTIFY bool "Enable memory corruption identification" depends on KASAN_SW_TAGS _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch mm.patch mm-memcontrol-switch-to-rstat-fix.patch kasan-remove-redundant-config-option-fix.patch mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch