Re: linux-next: manual merge of the arm64 tree with Linus' tree

[Catalin Marinas]

On Wed, Jan 25, 2023 at 08:36:47AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/Kconfig
> 
> between commit:
> 
>   68a63a412d18 ("arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y")
> 
> from Linus' tree and commit:
> 
>   baaf553d3bc3 ("arm64: Implement HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS")
> 
> from the arm64 tree.
[...]
> diff --cc arch/arm64/Kconfig
> index c5ccca26a408,de052d935832..000000000000
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -184,6 -186,10 +186,8 @@@ config ARM6
>   	select HAVE_DEBUG_KMEMLEAK
>   	select HAVE_DMA_CONTIGUOUS
>   	select HAVE_DYNAMIC_FTRACE
>  -	select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
>  -		if $(cc-option,-fpatchable-function-entry=2)
> + 	select HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS \
> + 		if (DYNAMIC_FTRACE_WITH_ARGS && !CFI_CLANG)
>   	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \
>   		if DYNAMIC_FTRACE_WITH_ARGS
>   	select HAVE_EFFICIENT_UNALIGNED_ACCESS

Thanks Stephen. It looks fine.

-- 
Catalin