The patch titled Subject: mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix has been added to the -mm tree. Its filename is mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-slub-kasan-enable-user-tracking-by-default-with-kasan%3Dy-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-slub-kasan-enable-user-tracking-by-default-with-kasan%3Dy-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/SubmitChecklist 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: mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix little fixes, per David Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/kasan.txt | 2 +- mm/slub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN Documentation/kasan.txt~mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix Documentation/kasan.txt --- a/Documentation/kasan.txt~mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix +++ a/Documentation/kasan.txt @@ -28,7 +28,7 @@ the latter is 1.1 - 2 times faster. Inli version 5.0 or later. Currently KASAN works only with the SLUB memory allocator. -For better bug detection and nicer report and enable CONFIG_STACKTRACE. +For better bug detection and nicer reporting, enable CONFIG_STACKTRACE. To disable instrumentation for specific files or directories, add a line similar to the following to the respective kernel Makefile: diff -puN mm/slub.c~mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix mm/slub.c --- a/mm/slub.c~mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix +++ a/mm/slub.c @@ -459,7 +459,7 @@ static void get_map(struct kmem_cache *s /* * Debug settings: */ -#ifdef CONFIG_SLUB_DEBUG_ON +#if defined(CONFIG_SLUB_DEBUG_ON) static int slub_debug = DEBUG_DEFAULT_FLAGS; #elif defined(CONFIG_KASAN) static int slub_debug = SLAB_STORE_USER; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch drivers-gpu-drm-i915-intel_spritec-fix-build.patch drivers-gpu-drm-i915-intel_tvc-fix-build.patch mm.patch slub-optimize-bulk-slowpath-free-by-detached-freelist-fix.patch uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix-fix.patch mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-fix.patch mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-checkpatch-fixes.patch mm-page_alloc-only-enforce-watermarks-for-order-0-allocations-fix-fix.patch mm-fix-declarations-of-nr-delta-and-nr_pagecache_reclaimable-fix.patch mm-oom_kill-fix-the-wrong-task-mm-==-mm-checks-in-oom_kill_process-fix.patch include-linux-mmzoneh-reflow-comment.patch mm-fs-introduce-mapping_gfp_constraint-checkpatch-fixes.patch mm-vmstatc-uninline-node_page_state.patch mm-vmstatc-uninline-node_page_state-fix.patch mm-cmac-suppress-warning.patch kasan-various-fixes-in-documentation-checkpatch-fixes.patch mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix.patch zsmalloc-add-comments-for-inuse-to-zspage-v2-fix.patch page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch mm-increase-swap_cluster_max-to-batch-tlb-flushes-fix-fix.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch mm-support-madvisemadv_free-fix-2.patch mm-support-madvisemadv_free-vs-thp-rename-split_huge_page_pmd-to-split_huge_pmd.patch mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch mm-dont-split-thp-page-when-syscall-is-called-fix-6-fix.patch mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch include-linux-compiler-gcch-improve-__visible-documentation.patch fs-jffs2-wbufc-remove-stray-semicolon.patch lib-documentation-synchronize-%p-formatting-documentation-fix-fix.patch rbtree-clarify-documentation-of-rbtree_postorder_for_each_entry_safe-fix.patch dma-mapping-tidy-up-dma_parms-default-handling-fix.patch panic-release-stale-console-lock-to-always-get-the-logbuf-printed-out-fix.patch linux-next-rejects.patch mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-nvem-fix.patch mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix.patch mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix.patch net-ipv4-routec-prevent-oops.patch drivers-rtc-rtc-pcf2127c-hack.patch remove-abs64.patch remove-abs64-fix.patch remove-abs64-fix-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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