]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for...
authorVlastimil Babka <vbabka@suse.cz>
Fri, 16 Jun 2023 09:05:59 +0000 (11:05 +0200)
committerVlastimil Babka <vbabka@suse.cz>
Fri, 16 Jun 2023 09:05:59 +0000 (11:05 +0200)
Merge the feature branches scheduled for 6.5:

- replace the usage of weak PRNGs, by David Keisar Schmidt

- introduce the SLAB_NO_MERGE kmem_cache flag, by Jesper Dangaard Brouer

- deprecate CONFIG_SLAB, with a planned removal, by myself

1  2  3  4 
include/linux/slab.h
mm/Kconfig
mm/slab.c
mm/slab.h
mm/slab_common.c

Simple merge
diff --cc mm/Kconfig
index 041f0da42f2b2ed3a1bb8657a6236f8a926c43ed,7672a22647b4a2434c22bda7b92b3897efc84783,7672a22647b4a2434c22bda7b92b3897efc84783,b537c4436d18de9398aa08051a2a7901ec6cf972..956fb36015c6d6b64db595685f65404f50f6ab17
        help
           This option allows to select a slab allocator.
    
--- config SLAB
---     bool "SLAB"
+++ config SLAB_DEPRECATED
+++     bool "SLAB (DEPRECATED)"
        depends on !PREEMPT_RT
 ---    select HAVE_HARDENED_USERCOPY_ALLOCATOR
        help
+++       Deprecated and scheduled for removal in a few cycles. Replaced by
+++       SLUB.
+++ 
+++       If you cannot migrate to SLUB, please contact linux-mm@kvack.org
+++       and the people listed in the SLAB ALLOCATOR section of MAINTAINERS
+++       file, explaining why.
+++ 
          The regular slab allocator that is established and known to work
          well in all environments. It organizes cache hot objects in
          per cpu and per node queues.
diff --cc mm/slab.c
Simple merge
diff --cc mm/slab.h
Simple merge
Simple merge