diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-11 20:54:46 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-11 20:54:46 +0100 |
| commit | 831ae274b0dcf8445ffb26930408f25ce7584b6b (patch) | |
| tree | 26d8bddbe3352032d9f5aec90bf6042f41af206e /kernel-x86_64-fedora.config | |
| parent | 64530ca54d7ff0185c9d837f9f96a0e2e441bc34 (diff) | |
| parent | 39cafd66089878f3d0d997260f1d0b1ede356e0d (diff) | |
| download | kernel-831ae274b0dcf8445ffb26930408f25ce7584b6b.tar.gz kernel-831ae274b0dcf8445ffb26930408f25ce7584b6b.tar.xz kernel-831ae274b0dcf8445ffb26930408f25ce7584b6b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc7.20201211git33dc9614dc20.97.vanilla.1.fc34kernel-5.10.0-0.rc7.20201211git33dc9614dc20.97.vanilla.1.fc33kernel-5.10.0-0.rc7.20201211git33dc9614dc20.97.vanilla.1.fc32
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 93eec445f..e41c91b4a 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1706,7 +1706,10 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set -# CONFIG_EVM is not set +# CONFIG_EVM_ADD_XATTRS is not set +CONFIG_EVM_ATTR_FSUUID=y +# CONFIG_EVM_LOAD_X509 is not set +CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set @@ -2431,9 +2434,10 @@ CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_MODSIG=y CONFIG_IMA_APPRAISE=y -# CONFIG_IMA_ARCH_POLICY is not set +CONFIG_IMA_ARCH_POLICY=y # CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH="sha256" CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set CONFIG_IMA_KEXEC=y @@ -2443,6 +2447,7 @@ CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_NG_TEMPLATE=y CONFIG_IMA_READ_POLICY=y +CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y # CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set # CONFIG_IMA_TRUSTED_KEYRING is not set @@ -2955,6 +2960,7 @@ CONFIG_KARMA_PARTITION=y # CONFIG_KASAN is not set # CONFIG_KASAN_VMALLOC is not set # CONFIG_KCOV is not set +# CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_GZIP is not set @@ -3029,7 +3035,6 @@ CONFIG_KS0108_PORT=0x378 # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set -# CONFIG_KCSAN is not set CONFIG_KSM=y CONFIG_KSZ884X_PCI=m # CONFIG_KUNIT is not set @@ -4180,6 +4185,7 @@ CONFIG_NFS_V3=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFS_V4_1=y +# CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFS_V4_2=y CONFIG_NFS_V4=m CONFIG_NF_TABLES_ARP=y |