From dd59893b60ab9fe8e12e16a2941908408a9781ed Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 31 Mar 2021 11:35:50 -0500 Subject: kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181 * Wed Mar 31 2021 Fedora Kernel Team [5.12.0-0.rc5.20210331git2bb25b3a748a.181] - configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini) - Remove _legacy_common_support (Justin M. Forbes) - redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-aarch64-fedora.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel-aarch64-fedora.config') diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d00cc1719..bfc38088c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6334,7 +6334,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set CONFIG_SLIMBUS=m CONFIG_SLIM_QCOM_CTRL=m CONFIG_SLIM_QCOM_NGD_CTRL=m -- cgit