git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: dd97b95438c812d8fd93d9426661a6c8e1520005 Steven Rostedt (Red Hat) (3): tracing: Fix counter for traceon/off event triggers tracing: Consolidate event trigger code tracing: Show available event triggers when no trigger is set Tom Zanussi (2): tracing/kprobes: Add trace event trigger invocations tracing: Remove double-underscore naming in syscall trigger invocations ---- include/linux/ftrace_event.h | 117 ++++++++++++++++++++++++++++++++++++ include/trace/ftrace.h | 23 ++----- kernel/trace/trace_events_trigger.c | 30 ++++++++- kernel/trace/trace_kprobe.c | 14 ++--- kernel/trace/trace_syscalls.c | 48 +++------------ 5 files changed, 163 insertions(+), 69 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/