[GIT PULL v2] ARM ftrace fixes for Thumb2, Clang and the EABI unwinder

[Ard Biesheuvel]

On Mon, 28 Feb 2022 at 15:16, Russell King (Oracle)
<linux at armlinux.org.uk> wrote:
>
> On Mon, Feb 28, 2022 at 03:11:31PM +0100, Ard Biesheuvel wrote:
> > On Mon, 28 Feb 2022 at 15:07, Russell King (Oracle)
> > <linux at armlinux.org.uk> wrote:
> > > Unsurprisingly, this increases the amount of conflicts (both
> > > arch/arm/Kconfig* files) when merging it with v5.17-rc1.
> >
> > Right, that does not surprise me either.
> >
> > Does this mean this needs to wait for v5.19?
>
> No, I've merged it now, just noting the additional conflicts, and
> through the power of git rerere...
>

Excellent, thanks.