summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:27:50 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:27:50 +0200
commit4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889 (patch)
tree150afad4fec988039a3a1adb2a41fb53c7541f8b /kernel-x86_64-fedora.config
parent959362ef3bbc5453308946a9bbb9d0b4a0d5c60f (diff)
parent91e7add6fe8f7ffb464d7d07e7f6e6e23e7e7f53 (diff)
downloadkernel-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-x86_64-fedora.config')
-rw-r--r--kernel-x86_64-fedora.config5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 733354add..898084f61 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -286,6 +286,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
@@ -1291,7 +1292,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_DEBUG_TIMEKEEPING is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_DEBUG_USER_ASCE is not set
# CONFIG_DEBUG_VIRTUAL is not set
# CONFIG_DEBUG_VM_PGFLAGS is not set
# CONFIG_DEBUG_VM_PGTABLE is not set
@@ -2588,7 +2588,6 @@ CONFIG_INFINIBAND_CXGB4=m
CONFIG_INFINIBAND_EFA=m
# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
CONFIG_INFINIBAND_HFI1=m
-CONFIG_INFINIBAND_I40IW=m
CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -2992,7 +2991,6 @@ CONFIG_ISCSI_IBFT=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=m
@@ -4578,7 +4576,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