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-ppc64le-fedora.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-ppc64le-fedora.config')
-rw-r--r-- | kernel-ppc64le-fedora.config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index cd87d1c9b..5984f3b51 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2426,7 +2426,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2968,6 +2968,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_PPC_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -7156,7 +7157,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set |