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

[Will Deacon]

On Thu, Nov 04, 2021 at 09:32:08AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm64 tree got conflicts in:
> 
>   arch/arm64/include/asm/stacktrace.h
>   arch/arm64/kernel/stacktrace.c
> 
> between commit:
> 
>   cd9bc2c92588 ("arm64: Recover kretprobe modified return address in stacktrace")
> 
> from Linus' tree and commit:
> 
>   552e196d88e5 ("arm64: ftrace: use HAVE_FUNCTION_GRAPH_RET_ADDR_PTR")
> 
> from the arm64 tree.

D'oh, having realised this conflict last week, I completely forgot about
it when queuing that fix from Mark. I'll just drop it and wait until -rc1.

Cheers,

Will