diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-31 11:35:50 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-31 11:35:50 -0500 |
commit | dd59893b60ab9fe8e12e16a2941908408a9781ed (patch) | |
tree | 17d458931ae43e8fa1d607468d57ed6922b5d480 /kernel-s390x-zfcpdump-rhel.config | |
parent | 424839b9c69d0380b65a338e105f91e4d2e44b43 (diff) | |
download | kernel-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-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ba7b3637d..a84ccab20 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3667,7 +3667,6 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y # CONFIG_NUMA is not set CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y -CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVME_FC is not set # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -4834,7 +4833,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=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 @@ -5527,7 +5526,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 is not set CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y |