summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-fedora.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-31 11:35:50 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-31 11:35:50 -0500
commitdd59893b60ab9fe8e12e16a2941908408a9781ed (patch)
tree17d458931ae43e8fa1d607468d57ed6922b5d480 /kernel-s390x-debug-fedora.config
parent424839b9c69d0380b65a338e105f91e4d2e44b43 (diff)
downloadkernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.tar.gz
kernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.tar.xz
kernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.zip
kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181
* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index faf4b88dc..b5a856330 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5339,7 +5339,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 is not set
CONFIG_SLIP_COMPRESSED=y
# CONFIG_SLIP is not set