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-x86_64-rhel.config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'kernel-x86_64-rhel.config') diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 59d31424f..1f40cc183 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3844,7 +3844,6 @@ CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y -CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -5017,7 +5016,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y 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_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5767,7 +5766,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y -- cgit