Ingo, 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: d73177789872d52ab916c749357b883d56208e21
Andi Kleen (1):
perf: Enable function tracing for perf core
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/cpu/Makefile | 1 -
arch/x86/kernel/entry_32.S | 3 +--
arch/x86/kernel/entry_64.S | 4 ++++
arch/x86/kernel/kprobes.c | 43 ++++++++++++++++++++++++++++++------------
kernel/Makefile | 2 +-
kernel/events/Makefile | 4 ----
kernel/kprobes.c | 3 ---
kernel/trace/Kconfig | 5 +++++
kernel/trace/Makefile | 6 +-----
kernel/trace/trace_events.c | 4 +++-
10 files changed, 46 insertions(+), 29 deletions(-)
signature.asc
Description: This is a digitally signed message part
