Messages in this thread | | | Date | Fri, 1 Oct 2021 08:27:33 +0900 | From | Masami Hiramatsu <> | Subject | Re: [PATCH -tip v11 00/27] kprobes: Fix stacktrace with kretprobes on x86 |
| |
On Fri, 01 Oct 2021 01:11:12 +0200 Thomas Gleixner <tglx@linutronix.de> wrote:
> On Thu, Sep 30 2021 at 17:22, Steven Rostedt wrote: > > On Thu, 30 Sep 2021 21:34:11 +0200 > > Thomas Gleixner <tglx@linutronix.de> wrote: > > > >> Masami, feel free to merge them over your tree. If not, let me know and > >> I'll pick them up tomorrow morning. > > > > Masami usually goes through my tree. Want me to take it or do you want > > to? > > Now I'm really confused. Masami poke Ingo to merge stuff which goes > usually through your tree !?! > > But sure, feel free to pick it up. I have enough stuff on my plate > already.
Let me explain how the patches are usually merged.
- kernel/kprobes.c related patches go through the tip tree. - kernel/trace/* patches go through the tracing tree.
So traditionally(?) I think this series go through the tip tree, but since the biggest user of kprobes is tracing and the kprobes fix now involves tree-wide fixes as you can see in this series, I think it is a good timing to move kprobes to tracing tree.
Thank you,
-- Masami Hiramatsu <mhiramat@kernel.org>
| |