diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:27:50 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:27:50 +0200 |
commit | 4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889 (patch) | |
tree | 150afad4fec988039a3a1adb2a41fb53c7541f8b /kernel-s390x-fedora.config | |
parent | 959362ef3bbc5453308946a9bbb9d0b4a0d5c60f (diff) | |
parent | 91e7add6fe8f7ffb464d7d07e7f6e6e23e7e7f53 (diff) | |
download | kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.tar.gz kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.tar.xz kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x-fedora.config')
-rw-r--r-- | kernel-s390x-fedora.config | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e53267df3..d369634c5 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -251,6 +251,7 @@ CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_858921=y +CONFIG_ARM64_MTE=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -1078,8 +1079,8 @@ CONFIG_CRYPTO_SHA1_S390=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256_S390=m CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA3_256_S390=m -CONFIG_CRYPTO_SHA3_512_S390=m +CONFIG_CRYPTO_SHA3_256_S390=y +CONFIG_CRYPTO_SHA3_512_S390=y CONFIG_CRYPTO_SHA3=y CONFIG_CRYPTO_SHA512_S390=m CONFIG_CRYPTO_SHA512=y @@ -2352,7 +2353,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -2681,7 +2681,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_CAPI=y # CONFIG_ISDN is not set # CONFIG_ISI is not set # CONFIG_ISL29003 is not set @@ -4220,7 +4219,6 @@ CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPT3001=m -CONFIG_OPTIMIZE_INLINING=y CONFIG_OPTPROBES=y CONFIG_ORANGEFS_FS=m CONFIG_ORINOCO_USB=m @@ -7016,7 +7014,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_VALIDATE_FS_PARSER=y -# CONFIG_VBOXSF_FS is not set CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set @@ -7366,7 +7363,6 @@ CONFIG_WWAN=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_MCELOG_LEGACY=y -CONFIG_X86_PLATFORM_DRIVERS_INTEL=y CONFIG_X86_SGX_KVM=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y |