[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230123174952.68b4a07e@gandalf.local.home>
Date: Mon, 23 Jan 2023 17:49:52 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Catalin Marinas <catalin.marinas@....com>
Cc: Mark Rutland <mark.rutland@....com>,
linux-arm-kernel@...ts.infradead.org, lenb@...nel.org,
linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
mhiramat@...nel.org, ndesaulniers@...gle.com, ojeda@...nel.org,
peterz@...radead.org, rafael.j.wysocki@...el.com,
revest@...omium.org, robert.moore@...el.com, will@...nel.org
Subject: Re: [PATCH v3 0/8] arm64/ftrace: Add support for
DYNAMIC_FTRACE_WITH_CALL_OPS
On Mon, 23 Jan 2023 14:40:29 +0000
Catalin Marinas <catalin.marinas@....com> wrote:
> Hi Mark,
>
> On Mon, Jan 23, 2023 at 01:45:55PM +0000, Mark Rutland wrote:
> > I'm not sure how we want to merge this, so I've moved the core ftrace
> > patch to the start of the series so that it can more easily be placed on
> > a stable branch if we want that to go via the ftrace tree and the rest
> > to go via arm64.
>
> Happy to queue the whole series since Steve acked the ftrace changes.
> But I'll put on a stable branch in case there are any conflicts with the
> ftrace tree.
>
I actually do have a conflict with this patch (I'll post it soon).
I could just cherry pick it from your tree. Linus seems to be OK with that
when it's just a single change.
-- Steve
Powered by blists - more mailing lists