kasan-unify-printk-prefixes.patch removed from -mm tree
The quilt patch titled
Subject: kasan: unify printk prefixes
has been removed from the -mm tree. Its filename was
kasan-unify-printk-prefixes.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: unify printk prefixes
Date: Fri, 6 Oct 2023 17:18:43 +0200
Unify prefixes for printk messages in mm/kasan/.
Link https://lkml.kernel.org/r/35589629806cf0840e5f01ec9d8011a7bad648df.1696605143.git.andreyknvl@google.com open here
Signed-off-by Andrey Konovalov <[email protected]>
Reviewed-by Marco Elver <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc kernel test robot <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/kasan/kasan_test.c | 2 +- mm/kasan/kasan_test_module.c | 2 +- mm/kasan/quarantine.c | 4 +++- mm/kasan/report_generic.c | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-)
mm/kasan/kasan_test.c renamed from mm/kasan/kasan_test.c~kasan-unify-printk-prefixes +1 -1
@@ -5,7 +5,7 @@* Author: Andrey Ryabinin <[email protected]> */ -#define pr_fmt (fmt) "kasan_test: " fmt +#define pr_fmt (fmt) "kasan: test: " fmt#include <kunit/test.h> #include <linux/bitops.h>
mm/kasan/kasan_test_module.c renamed from mm/kasan/kasan_test_module.c~kasan-unify-printk-prefixes +1 -1
@@ -5,7 +5,7 @@* Author: Andrey Ryabinin <[email protected]> */ -#define pr_fmt (fmt) "kasan test: %s " fmt, __func__ +#define pr_fmt (fmt) "kasan: test: " fmt#include <linux/mman.h> #include <linux/module.h>
mm/kasan/quarantine.c renamed from mm/kasan/quarantine.c~kasan-unify-printk-prefixes +3 -1
@@ -8,6 +8,8 @@* Based on code by Dmitry Chernenkov. */ +#define pr_fmt (fmt) "kasan: " fmt +#include <linux/gfp.h> #include <linux/hash.h> #include <linux/kernel.h>
@@ -414,7 +416,7 @@ static int __init kasan_cpu_quarantine_i ret =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"mm/kasan:online" , kasan_cpu_online, kasan_cpu_offline);if (ret <0 ) -pr_err ("kasan cpu quarantine register failed [%d]\n" , ret); +pr_err ("cpu quarantine register failed [%d]\n" , ret);return ret; }late_initcall (kasan_cpu_quarantine_init);
mm/kasan/report_generic.c renamed from mm/kasan/report_generic.c~kasan-unify-printk-prefixes +3 -3
@@ -220,7 +220,7 @@ static bool __must_check tokenize_frame_const size_t tok_len = sep - *frame_descr;if (tok_len +1 > max_tok_len) { -pr_err ("KASAN internal error: frame description too long: %s\n" , +pr_err ("internal error: frame description too long: %s\n" , *frame_descr);return false; }
@@ -233,7 +233,7 @@ static bool __must_check tokenize_frame_ *frame_descr = sep +1 ;if (value !=NULL &&kstrtoul (token,10 , value)) { -pr_err ("KASAN internal error: not a valid number: %s\n" , token); +pr_err ("internal error: not a valid number: %s\n" , token);return false; }
@@ -323,7 +323,7 @@ static bool __must_check get_address_sta frame = (const unsigned long *)(mem_ptr +KASAN_GRANULE_SIZE );if (frame[0 ] !=KASAN_CURRENT_STACK_FRAME_MAGIC ) { -pr_err ("KASAN internal error: frame info validation failed; invalid marker: %lu\n" , +pr_err ("internal error: frame has invalid marker: %lu\n" , frame[0 ]);return false; }
_
Patches currently in -mm which might be from [email protected] are