[folded-merged] mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix
has been removed from the -mm tree.  Its filename was
     mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix.patch

This patch was dropped because it was folded into mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y.patch

------------------------------------------------------
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

uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
mm-vmstatc-uninline-node_page_state.patch
mm-cmac-suppress-warning.patch
memcg-fix-thresholds-for-32b-architectures.patch
mm-slub-kasan-enable-user-tracking-by-default-with-kasan=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



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux