The patch titled Subject: mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled has been added to the -mm tree. Its filename is mm-add-restriction-when-memory_hotplug-config-enable.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-add-restriction-when-memory_hotplug-config-enable.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-add-restriction-when-memory_hotplug-config-enable.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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: zhong jiang <zhongjiang@xxxxxxxxxx> Subject: mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled At present it is obvious that memory online and offline will fail when KASAN is enabled. So add the condition to limit the memory_hotplug when KASAN is enabled. Link: http://lkml.kernel.org/r/1470063651-29519-1-git-send-email-zhongjiang@xxxxxxxxxx Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx> Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Cc: Alexander Potapenko <glider@xxxxxxxxxx> Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -puN mm/Kconfig~mm-add-restriction-when-memory_hotplug-config-enable mm/Kconfig --- a/mm/Kconfig~mm-add-restriction-when-memory_hotplug-config-enable +++ a/mm/Kconfig @@ -187,6 +187,7 @@ config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA depends on ARCH_ENABLE_MEMORY_HOTPLUG + depends on !KASAN config MEMORY_HOTPLUG_SPARSE def_bool y _ Patches currently in -mm which might be from zhongjiang@xxxxxxxxxx are mm-add-restriction-when-memory_hotplug-config-enable.patch mm-page_owner-align-with-pageblock_nr-pages.patch mm-walk-the-zone-in-pageblock_nr_pages-steps.patch kexec-add-restriction-on-kexec_load-segment-sizes.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html