git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 2a5bfe47624bfc835aa0632a0505ba55576c98db
Steven Rostedt (VMware) (2):
tracing: Only have rmmod clear buffers that its events were active in
ftrace: Zero out ftrace hashes when a module is removed
Zev Weiss (1):
ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able
----
include/linux/ftrace.h | 4 +--
include/linux/trace_events.h | 8 +++---
kernel/trace/ftrace.c | 58 +++++++++++++++++++++++++++++++++++++++++---
kernel/trace/trace.c | 3 +++
kernel/trace/trace.h | 1 +
kernel/trace/trace_events.c | 15 ++++++------
6 files changed, 71 insertions(+), 18 deletions(-)
