* Steven Rostedt <[email protected]> wrote:
> Ingo,
>
> As I believe the -pg removal from perf was holding up the patch
> set, although Frederic and I are working that out, I rebased my
> patch set to remove that change, for a later time.
>
> The rest holds fixes to bugs that are in your queue for 3.7.
>
> Please pull the latest tip/perf/core tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
> tip/perf/core
>
> Head SHA1: c6aaf4d0bb86e2154ea31a33804cec300611255f
>
>
> Josh Triplett (1):
> trace: Stop compiling in trace_clock unconditionally
>
> Masami Hiramatsu (3):
> ftrace/x86: Adjust x86 regs.ip as like as x86-64
> kprobes/x86: Fix kprobes to collectly handle IP on ftrace
> kprobes/x86: Fix to support jprobes on ftrace-based kprobe
>
> Steven Rostedt (1):
> ftrace/x86-64: Allow to change RIP in handlers
>
> Yuanhan Liu (1):
> tracing: Skip printing "OK" if failed to disable event
>
> ----
> arch/x86/kernel/entry_32.S | 3 +--
> arch/x86/kernel/entry_64.S | 4 ++++
> arch/x86/kernel/kprobes.c | 43
> +++++++++++++++++++++++++++++++------------
> kernel/Makefile | 2 +-
> kernel/kprobes.c | 3 ---
> kernel/trace/Kconfig | 5 +++++
> kernel/trace/Makefile | 6 +-----
> kernel/trace/trace_events.c | 4 +++-
> 8 files changed, 46 insertions(+), 24 deletions(-)
Pulled, thanks Steve!
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/
