From: Vlastimil Babka <vbabka@suse.cz>
Date: Fri, 16 Jun 2023 09:05:59 +0000 (+0200)
Subject: Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7bc162d5cc4de5c33c5570dba2719a01506a9fd0;p=linux.git

Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' into slab/for-next

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

7bc162d5cc4de5c33c5570dba2719a01506a9fd0
diff --cc mm/Kconfig
index 041f0da42f2b2,7672a22647b4a,7672a22647b4a,b537c4436d18d..956fb36015c6d
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@@@ -218,10 -218,11 -218,11 -218,18 +218,17 @@@@@ choic
    	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.