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

diff --cc arch/arm/Kconfig
index dcf2df6,4f61c97,ec317bc..11b6200
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/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

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/vmlinux-xip.lds.S
Simple merge

diff --cc arch/arm/mach-imx/pm-imx6.c
Simple merge

diff --cc arch/arm/mm/proc-macros.S
Simple merge