* Masami Hiramatsu <[email protected]> wrote:

> (2013/07/23 6:00), Jiri Kosina wrote:
> > On Mon, 22 Jul 2013, H. Peter Anvin wrote:
> > 
> >>  What is the baseline for this patch?
> > 
> > Hi!
> > 
> > it's x86/jumplabel branch, as a followup to commit 
> > fd4363fff3d96 ("x86: Introduce int3 (breakpoint)-based instruction 
> > patching") sitting there.
> 
> AFAICS, tip/master already merged Jiri's works on tip/x86/jumplabel.
> Thus both branches need this. (especially, since this is actual
> bugfix, it should go into tip/master.)

I resolved it yesterday by keeping the kprobes patches in perf/core - just 
forgot to push it all out.

I've pushed it out now, so perf/core should be a baseline: it merges in 
x86/jumplabel and then applies the kprobes patches (historically in 
perf/core).

Thanks,

        Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to