diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-11 21:28:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-11 21:28:07 +0200 |
| commit | 2fea534163f5b11f062c75a3b94efd973f7137ef (patch) | |
| tree | e4a53e3528bb679b5868999d05ee52da82f33916 /kernel-x86_64-debug-rhel.config | |
| parent | 8331bd9c45cea3b4964b0a5fa301b375683fe103 (diff) | |
| parent | f70c5100799fd072342b834082b35e1edb831747 (diff) | |
| download | kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.tar.gz kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.tar.xz kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.zip | |
merge masterkernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc35kernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc34kernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-debug-rhel.config')
| -rw-r--r-- | kernel-x86_64-debug-rhel.config | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2f47f41e2..37be326b8 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -347,6 +347,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1555,7 +1556,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2239,7 +2240,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2249,7 +2250,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2286,7 +2286,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -2725,7 +2725,8 @@ CONFIG_KERNEL_HEADER_TEST=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_FILE=y CONFIG_KEXEC_JUMP=y -# CONFIG_KEXEC_SIG is not set +# CONFIG_KEXEC_SIG_FORCE is not set +CONFIG_KEXEC_SIG=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set @@ -6644,6 +6645,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set |