git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace/for-next
Head SHA1: 8053f49fed581c40fcc87fa54904f4fa473f46b7
Steven Rostedt (1):
tracing: Remove duplicate latency_fsnotify() stub
Wesley Atwell (2):
tracing: Append repeated boot-time tracing parameters
tracing: Preserve repeated trace_trigger boot parameters
----
kernel/trace/ftrace.c | 12 ++++++++----
kernel/trace/trace.c | 31 ++++++++++++++++++++++++++++++-
kernel/trace/trace.h | 4 +++-
kernel/trace/trace_events.c | 13 ++++++++++---
kernel/trace/trace_kprobe.c | 3 ++-
kernel/trace/trace_snapshot.c | 3 +--
6 files changed, 54 insertions(+), 12 deletions(-)