summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-zfcpdump-rhel.config
diff options
context:
space:
mode:
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r--kernel-s390x-zfcpdump-rhel.config5
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