git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: a27026e95b57acbb8df7182e020b099e7f3b5ac3 Adrian Hunter (1): ftrace: Fix missing synchronize_rcu() removing trampoline from kallsyms Jason Yan (1): bootconfig: init: make xbc_namebuf static Masami Hiramatsu (2): kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() kprobes: tracing/kprobes: Fix to kill kprobes on initmem after boot Miroslav Benes (1): ftrace: Free the trampoline when ftrace_startup() fails Sebastian Andrzej Siewior (1): tracing: Make the space reserved for the pid wider Tobias Klauser (1): ftrace: Let ftrace_enable_sysctl take a kernel pointer buffer Tom Rix (1): tracing: fix double free ---- include/linux/ftrace.h | 3 +-- include/linux/kprobes.h | 5 +++++ init/main.c | 4 +++- kernel/kprobes.c | 27 +++++++++++++++++++++++++-- kernel/trace/ftrace.c | 6 ++++-- kernel/trace/trace.c | 38 +++++++++++++++++++------------------- kernel/trace/trace_events_hist.c | 1 - kernel/trace/trace_output.c | 12 ++++++------ 8 files changed, 63 insertions(+), 33 deletions(-)