[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230411124749.7aeea715@gandalf.local.home>
Date: Tue, 11 Apr 2023 12:47:49 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Mark Rutland <mark.rutland@....com>
Cc: Florent Revest <revest@...omium.org>, catalin.marinas@....com,
will@...nel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, linux-trace-kernel@...r.kernel.org,
bpf@...r.kernel.org, mhiramat@...nel.org, ast@...nel.org,
daniel@...earbox.net, andrii@...nel.org, kpsingh@...nel.org,
jolsa@...nel.org, xukuohai@...weicloud.com, lihuafei1@...wei.com,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH v6 0/5] Add ftrace direct call for arm64
On Tue, 11 Apr 2023 16:56:45 +0100
Mark Rutland <mark.rutland@....com> wrote:
> IIUC Steve was hoping to take the FUNCTION_GRAPH_RETVAL series through the
> trace tree, and if that's still the plan, maybe both should go that way?
The conflict is minor, and I think I prefer to still have the ARM64 bits go
through the arm64 tree, as it will get better testing, and I don't like to
merge branches ;-)
I've added Linus to the Cc so he knows that there will be conflicts, but as
long as we mention it in our pull request, with a branch that includes the
solution, it should be fine going through two different trees.
-- Steve
Powered by blists - more mailing lists