From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Date: Tue, 2 Nov 2021 09:04:22 +0000 (+0000)
Subject: Merge branches 'devel-stable' and 'misc' into for-linus
X-Git-Tag: v6.1-rc5~2761^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11779842dd6f59505f5685bdd6ebaaa7a5bc1d94;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'devel-stable' and 'misc' into for-linus
---

11779842dd6f59505f5685bdd6ebaaa7a5bc1d94
diff --cc arch/arm/Kconfig
index dcf2df6,4f61c978,ec317bc..11b6200
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -91,8 -91,7 -91,7 +91,8 @@@@ config AR
   	select HAVE_FAST_GUP if ARM_LPAE
   	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
   	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
-- 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL
++ 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !(THUMB2_KERNEL && CC_IS_CLANG)
 ++	select HAVE_FUTEX_CMPXCHG if FUTEX
   	select HAVE_GCC_PLUGINS
   	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
   	select HAVE_IRQ_TIME_ACCOUNTING