Messages in this thread | | | Date | Tue, 19 Oct 2021 12:09:12 +0100 | From | Will Deacon <> | Subject | Re: [PATCH v3 00/17] clocksource/arm_arch_timer: Add basic ARMv8.6 support |
| |
On Mon, Oct 18, 2021 at 09:51:19AM +0200, Daniel Lezcano wrote: > On 17/10/2021 11:57, Marc Zyngier wrote: > > Hi Daniel, > > > > On Sat, 16 Oct 2021 22:59:33 +0100, > > Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > >> > >> > >> Hi Marc, > >> > >> > >> On 11/10/2021 15:39, Marc Zyngier wrote: > >> > >> [ ... ] > >> > >>> Thanks for that. All addressed now. I'll repost the series once we've > >>> addressed the question below. > >>> > >>>> How do you want to merge this series? It would be nice to have the arch > >>>> bits in the arm64 tree, if possible, as we'll be tripping over the cpucaps > >>>> stuff otherwise. > >>> > >>> I think we should keep the series together, as asm/arch_timer.h gets a > >>> beating all over the place, and there is no chance the arm64 bits at > >>> the end can apply (let alone work) on their own. > >>> > >>> So either Daniel would ack the series for it to go via arm64, or > >>> create a stable branch with the first 13 patches that would go in both > >>> the clocksource and arm64 trees. > >>> > >>> Daniel, any preference? > >> > >> yes, I prefer a stable branch for this series. > >> > >> https://git.linaro.org/people/daniel.lezcano/linux.git/log/?h=timers/drivers/armv8.6_arch_timer > >> > > > > OK, this branch is now slightly outdated, since I have reworked it at > > Will's request. -rc5 is also too recent a base for arm64, which is > > usually based on -rc3. > > > > I'll repost a new series today or tomorrow and provide tags for both > > you and Will to pull from. > > Ok, thanks. I've updated the branch accordingly. > > Let me know if everything is fine, so I can prepare a PR for the 'tip' tree.
Thanks, I've pulled that branch into the arm64 tree so please don't rebase it now.
Will
| |