diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-30 18:40:08 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-30 18:40:08 +0100 |
commit | b7accfefcecf13b2d477cb24d01016c73fe03fe9 (patch) | |
tree | d4841b55196d770def9ac377ba9f05b1779b0c95 /kernel-s390x-fedora.config | |
parent | 0ba20cb7f23e1e47882f44add1a539db285fe604 (diff) | |
parent | f760a275cec0a8dda88e2cde5c0cd8fc133283cc (diff) | |
download | kernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.tar.gz kernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.tar.xz kernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc2.83.vanilla.1.fc36kernel-5.17.0-0.rc2.83.vanilla.1.fc35kernel-5.17.0-0.rc2.83.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r-- | kernel-s390x-fedora.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 4ef590a7a..7648436af 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -264,6 +264,7 @@ CONFIG_ARM64_EPAN=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +# CONFIG_ARM64_ERRATUM_2051678 is not set CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2119858=y @@ -994,7 +995,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20POLY1305=m -# CONFIG_CRYPTO_CHACHA_S390 is not set +CONFIG_CRYPTO_CHACHA_S390=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C=y @@ -4958,6 +4959,7 @@ CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST=y CONFIG_S390_HYPFS_FS=y # CONFIG_S390_KPROBES_SANITY_TEST is not set +# CONFIG_S390_MODULES_SANITY_TEST is not set CONFIG_S390_PRNG=m CONFIG_S390_TAPE_34XX=m CONFIG_S390_TAPE_3590=m |