Skip to content

Commit 7bc162d

Browse files
committed
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
4 parents 1143c9d + ffe4dfe + d5bf485 + eb07c4f commit 7bc162d

File tree

141 files changed

+51
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+51
-178
lines changed

arch/arc/configs/axs103_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
1313
CONFIG_PERF_EVENTS=y
1414
# CONFIG_VM_EVENT_COUNTERS is not set
1515
# CONFIG_COMPAT_BRK is not set
16-
CONFIG_SLAB=y
1716
CONFIG_MODULES=y
1817
CONFIG_MODULE_FORCE_LOAD=y
1918
CONFIG_MODULE_UNLOAD=y

arch/arc/configs/haps_hs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_BLK_DEV_INITRD=y
1414
CONFIG_EXPERT=y
1515
CONFIG_PERF_EVENTS=y
1616
# CONFIG_COMPAT_BRK is not set
17-
CONFIG_SLAB=y
1817
CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs"
1918
CONFIG_MODULES=y
2019
# CONFIG_BLK_DEV_BSG is not set

arch/arc/configs/haps_hs_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y
1515
CONFIG_PERF_EVENTS=y
1616
# CONFIG_VM_EVENT_COUNTERS is not set
1717
# CONFIG_COMPAT_BRK is not set
18-
CONFIG_SLAB=y
1918
CONFIG_SMP=y
2019
CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs_idu"
2120
CONFIG_KPROBES=y

arch/arc/configs/hsdk_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
1313
CONFIG_PERF_EVENTS=y
1414
# CONFIG_VM_EVENT_COUNTERS is not set
1515
# CONFIG_COMPAT_BRK is not set
16-
CONFIG_SLAB=y
1716
CONFIG_MODULES=y
1817
CONFIG_MODULE_UNLOAD=y
1918
CONFIG_ARC_SOC_HSDK=y

arch/arc/configs/tb10x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ CONFIG_KALLSYMS_ALL=y
1919
CONFIG_EMBEDDED=y
2020
# CONFIG_COMPAT_BRK is not set
2121
CONFIG_ISA_ARCOMPACT=y
22-
CONFIG_SLAB=y
2322
CONFIG_MODULES=y
2423
CONFIG_MODULE_FORCE_LOAD=y
2524
CONFIG_MODULE_UNLOAD=y

arch/arm/configs/am200epdkit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ CONFIG_MODULES=y
1515
CONFIG_MODULE_UNLOAD=y
1616
CONFIG_PARTITION_ADVANCED=y
1717
# CONFIG_SWAP is not set
18-
CONFIG_SLAB=y
1918
# CONFIG_VM_EVENT_COUNTERS is not set
2019
CONFIG_NET=y
2120
CONFIG_PACKET=m

arch/arm/configs/at91_dt_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ CONFIG_MODULES=y
2727
CONFIG_MODULE_UNLOAD=y
2828
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
2929
# CONFIG_SWAP is not set
30-
CONFIG_SLAB=y
3130
CONFIG_NET=y
3231
CONFIG_PACKET=y
3332
CONFIG_UNIX=y

arch/arm/configs/dove_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONFIG_VFP=y
1717
CONFIG_MODULES=y
1818
CONFIG_MODULE_UNLOAD=y
1919
CONFIG_PARTITION_ADVANCED=y
20-
CONFIG_SLAB=y
2120
CONFIG_NET=y
2221
CONFIG_PACKET=y
2322
CONFIG_UNIX=y

arch/arm/configs/ep93xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ CONFIG_MODULES=y
2424
CONFIG_MODULE_UNLOAD=y
2525
CONFIG_MODULE_FORCE_UNLOAD=y
2626
CONFIG_PARTITION_ADVANCED=y
27-
CONFIG_SLAB=y
2827
CONFIG_NET=y
2928
CONFIG_PACKET=y
3029
CONFIG_UNIX=y

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ CONFIG_KPROBES=y
2626
CONFIG_MODULES=y
2727
CONFIG_MODULE_UNLOAD=y
2828
# CONFIG_SWAP is not set
29-
CONFIG_SLAB=y
3029
# CONFIG_COMPAT_BRK is not set
3130
CONFIG_NET=y
3231
CONFIG_PACKET=y

0 commit comments

Comments
 (0)