diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-01 08:07:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-01 08:07:07 +0200 |
| commit | 614fca69c08c4277db85b6587755960f40e18d87 (patch) | |
| tree | 8dc08a04842e09b56bd80e17efe664ffbd7cc7e8 /kernel-x86_64-rhel.config | |
| parent | 628c658417424cda09ce38695b24ad186dc44fcb (diff) | |
| parent | dd59893b60ab9fe8e12e16a2941908408a9781ed (diff) | |
| download | kernel-614fca69c08c4277db85b6587755960f40e18d87.tar.gz kernel-614fca69c08c4277db85b6587755960f40e18d87.tar.xz kernel-614fca69c08c4277db85b6587755960f40e18d87.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-rhel.config')
| -rw-r--r-- | kernel-x86_64-rhel.config | 5 |
1 files changed, 2 insertions, 3 deletions
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 |