summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-12 16:41:14 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-12 16:41:14 +0200
commit8f3f0017691ec9ec0adb94b92084fc1f402df95c (patch)
tree8e0ebe1cfe0d1ebee69df0b17fc686a28c11327e /kernel-s390x-debug-rhel.config
parent2fea534163f5b11f062c75a3b94efd973f7137ef (diff)
parent37444a667978d0c9faebd34834312cd92a25c89b (diff)
downloadkernel-8f3f0017691ec9ec0adb94b92084fc1f402df95c.tar.gz
kernel-8f3f0017691ec9ec0adb94b92084fc1f402df95c.tar.xz
kernel-8f3f0017691ec9ec0adb94b92084fc1f402df95c.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc1.16.vanilla.1.fc35kernel-5.14.0-0.rc1.16.vanilla.1.fc34kernel-5.14.0-0.rc1.16.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-debug-rhel.config')
-rw-r--r--kernel-s390x-debug-rhel.config3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index e56817acf..2019eb5cc 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
+# CONFIG_ARM_FFA_TRANSPORT is not set
# CONFIG_ARM_MHU_V2 is not set
CONFIG_ARM_SMCCC_SOC_ID=y
# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -4297,6 +4298,7 @@ CONFIG_RENESAS_PHY=m
# CONFIG_RESET_BRCMSTB_RESCAL is not set
# CONFIG_RESET_CONTROLLER is not set
# CONFIG_RESET_INTEL_GW is not set
+# CONFIG_RESET_MCHP_SPARX5 is not set
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_TI_SYSCON is not set
CONFIG_RETPOLINE=y
@@ -5430,6 +5432,7 @@ CONFIG_STACK_GUARD=256
CONFIG_STACK_HASH_ORDER=20
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STACKPROTECTOR=y
+# CONFIG_STACKTRACE_BUILD_ID is not set
CONFIG_STACK_TRACER=y
# CONFIG_STAGING is not set
# CONFIG_STAGING_MEDIA is not set