From: "Russell King (Oracle)" <linux@armlinux.org.uk>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL v2] ARM ftrace fixes for Thumb2, Clang and the EABI unwinder
Date: Mon, 28 Feb 2022 14:16:05 +0000 [thread overview]
Message-ID: <YhzZJZ1E1koAxbvY@shell.armlinux.org.uk> (raw)
In-Reply-To: <CAMj1kXH9yTODpbtsR0gw0irWW+6Ai7TZp8O0ao_zo4D8pNL-jQ@mail.gmail.com>
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@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...
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-28 14:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 14:37 [GIT PULL v2] ARM ftrace fixes for Thumb2, Clang and the EABI unwinder Ard Biesheuvel
2022-02-28 12:46 ` Ard Biesheuvel
2022-02-28 14:07 ` Russell King (Oracle)
2022-02-28 14:11 ` Ard Biesheuvel
2022-02-28 14:16 ` Russell King (Oracle) [this message]
2022-02-28 14:23 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YhzZJZ1E1koAxbvY@shell.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=ardb@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.