[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20241118120642.211fb11f@gandalf.local.home>
Date: Mon, 18 Nov 2024 12:06:42 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: jeff.xie@...ux.dev
Cc: mhiramat@...nel.org, mathieu.desnoyers@...icios.com,
linux-trace-kernel@...r.kernel.org, linux-kernel@...r.kernel.org,
xiehuan09@...il.com, dolinux.peng@...il.com, chensong_2000@....cn
Subject: Re: [PATCH v5] ftrace: Get the true parent ip for function tracer
On Mon, 18 Nov 2024 11:43:20 -0500
Steven Rostedt <rostedt@...dmis.org> wrote:
> On Mon, 18 Nov 2024 16:15:02 +0000
> jeff.xie@...ux.dev wrote:
>
> > October 8, 2024 at 11:31 AM, "Jeff Xie" <jeff.xie@...ux.dev> wrote:
> >
> > I'd like to know if this patch can be merged into 6.13?
>
> Bah' I missed seeing this update and it was buried in patchwork on the 3rd page :-p
>
> I wish you pinged me last week.
>
> I just sent my pull request for the ftrace topic branch, but since the
> merge window just opened, I can start testing this now and then push it to
> next. Wait a few days and then send another pull request to Linus by the
> end of the week, if nothing breaks.
>
This patch conflicts with a clean up patch I incorrectly put in my trace
topic branch (where it should have gone in the ftrace topic branch). I
haven't sent a pull request for the trace topic branch, so I'll just apply
this patch on top of that (fix the conflict), test it, push it to
linux-next, and then send it later this week.
-- Steve
Powered by blists - more mailing lists