Commit 7bc162d5 authored Jun 16, 2023 by Vlastimil Babka

Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and...

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

parents 1143c9d9 ffe4dfe0 d5bf4857 eb07c4f3

arch/arc/configs/axs103_smp_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB=y
		CONFIG_MODULES=y
		CONFIG_MODULE_FORCE_LOAD=y
		CONFIG_MODULE_UNLOAD=y

arch/arc/configs/haps_hs_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ CONFIG_BLK_DEV_INITRD=y
		CONFIG_EXPERT=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB=y
		CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs"
		CONFIG_MODULES=y
		# CONFIG_BLK_DEV_BSG is not set

arch/arc/configs/haps_hs_smp_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB=y
		CONFIG_SMP=y
		CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs_idu"
		CONFIG_KPROBES=y

arch/arc/configs/hsdk_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_ARC_SOC_HSDK=y

arch/arc/configs/tb10x_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ CONFIG_KALLSYMS_ALL=y
		CONFIG_EMBEDDED=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_ISA_ARCOMPACT=y
		CONFIG_SLAB=y
		CONFIG_MODULES=y
		CONFIG_MODULE_FORCE_LOAD=y
		CONFIG_MODULE_UNLOAD=y