Merge branch 'slab/for-6.1/common_kmalloc' into slab/for-next
authorVlastimil Babka <vbabka@suse.cz>
Fri, 23 Sep 2022 08:32:02 +0000 (10:32 +0200)
committerVlastimil Babka <vbabka@suse.cz>
Fri, 23 Sep 2022 08:32:02 +0000 (10:32 +0200)
The "common kmalloc v4" series [1] by Hyeonggon Yoo.

- Improves the mm/slab_common.c wrappers to allow deleting duplicated
  code between SLAB and SLUB.
- Large kmalloc() allocations in SLAB are passed to page allocator like
  in SLUB, reducing number of kmalloc caches.
- Removes the {kmem_cache_alloc,kmalloc}_node variants of tracepoints,
  node id parameter added to non-_node variants.
- 8 files changed, 341 insertions(+), 651 deletions(-)

[1] https://lore.kernel.org/all/20220817101826.236819-1-42.hyeyoo@gmail.com/

--
Merge resolves trivial conflict in mm/slub.c with commit 5373b8a09d6e
("kasan: call kasan_malloc() from __kmalloc_*track_caller()")

1  2 
mm/slab_common.c
mm/slub.c

Simple merge
diff --cc mm/slub.c
Simple merge