summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-08 14:57:58 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-08 14:57:58 -0500
commit380d6c25863b5edd89b68cda24e0f4dfae5cbc25 (patch)
tree5cfa3518b1f5cd1e793be05a47ce80c0387511fb /kernel-s390x-rhel.config
parent7ab3430578bb44245900b015eefd4644be051cfe (diff)
downloadkernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.tar.gz
kernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.tar.xz
kernel-380d6c25863b5edd89b68cda24e0f4dfae5cbc25.zip
kernel-5.14.0-0.rc0.20210708gite9f1cbc0c411.13
* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.13] - Fix the perf trace link location (Justin M. Forbes) - drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 (Michal Suchanek) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 38f2c5e25..7150dbde9 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -319,6 +319,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
@@ -1438,7 +1439,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"
@@ -2063,7 +2064,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
@@ -2072,7 +2073,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
@@ -2108,7 +2108,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB is not set
-# CONFIG_INFINIBAND_IRDMA is not set
+CONFIG_INFINIBAND_IRDMA=m
# CONFIG_INFINIBAND_ISER is not set
# CONFIG_INFINIBAND_ISERT is not set
CONFIG_INFINIBAND=m
@@ -6335,6 +6335,7 @@ CONFIG_WAN=y
# CONFIG_WARN_DYNAMIC_STACK 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