[folded-merged] mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch removed from -mm tree

[folded-merged] mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: slub: STACKDEPOT: rename save_stack_trace()
has been removed from the -mm tree.  Its filename was
     mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix.patch

This patch was dropped because it was folded into mm-slub-use-stackdepot-to-save-stack-trace-in-objects.patch

------------------------------------------------------
From: Randy Dunlap <rdunlap@infradead.org>
Subject: slub: STACKDEPOT: rename save_stack_trace()

save_stack_trace() already exists, so change the one in
CONFIG_STACKDEPOT to be save_stack_depot_trace().

Fixes this build error:

../mm/slub.c:607:29: error: conflicting types for `save_stack_trace'
 static depot_stack_handle_t save_stack_trace(gfp_t flags)
                             ^~~~~~~~~~~~~~~~
In file included from ../include/linux/page_ext.h:6:0,
                 from ../include/linux/mm.h:25,
                 from ../mm/slub.c:13:
../include/linux/stacktrace.h:86:13: note: previous declaration of `save_stack_trace' was here
 extern void save_stack_trace(struct stack_trace *trace);
             ^~~~~~~~~~~~~~~~

from this patch in mmotm:
  Subject: mm/slub: use stackdepot to save stack trace in objects

Link: https://lkml.kernel.org/r/20210513051920.29320-1-rdunlap@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Oliver Glitta <glittao@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/slub.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/mm/slub.c~mm-slub-use-stackdepot-to-save-stack-trace-in-objects-fix
+++ a/mm/slub.c
@@ -627,7 +627,7 @@ static struct track *get_track(struct km
 }
 
 #ifdef CONFIG_STACKDEPOT
-static depot_stack_handle_t save_stack_trace(gfp_t flags)
+static depot_stack_handle_t save_stack_depot_trace(gfp_t flags)
 {
 	unsigned long entries[TRACK_ADDRS_COUNT];
 	depot_stack_handle_t handle;
@@ -646,7 +646,7 @@ static void set_track(struct kmem_cache
 
 	if (addr) {
 #ifdef CONFIG_STACKDEPOT
-		p->handle = save_stack_trace(GFP_KERNEL);
+		p->handle = save_stack_depot_trace(GFP_KERNEL);
 #endif
 		p->addr = addr;
 		p->cpu = smp_processor_id();
_

Patches currently in -mm which might be from rdunlap@infradead.org are

mm-slub-use-stackdepot-to-save-stack-trace-in-objects.patch
module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-2.patch