diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-17 16:16:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-17 16:16:24 +0200 |
commit | 5b38c35d56d66c46ac0df614dc8ead9d814109e1 (patch) | |
tree | d55fdb354cfbcf953acdc38b5f81ed84e068581d /kernel-s390x-rhel.config | |
parent | bb5954ada68e6443df3ba7beff0b070101c23fc6 (diff) | |
parent | 6f55855269466073772364bcf274046945891597 (diff) | |
download | kernel-5b38c35d56d66c46ac0df614dc8ead9d814109e1.tar.gz kernel-5b38c35d56d66c46ac0df614dc8ead9d814109e1.tar.xz kernel-5b38c35d56d66c46ac0df614dc8ead9d814109e1.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc2.19.vanilla.1.fc35kernel-5.13.0-0.rc2.19.vanilla.1.fc34kernel-5.13.0-0.rc2.19.vanilla.1.fc33kernel-5.13.0-0.rc2.19.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5a5be3f3f..fd0ff1dcc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2154,9 +2154,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2646,6 +2648,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3334,7 +3337,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y |