git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace/for-next

Head SHA1: c9f79d5021b714fb39cc9110fc092196d17cc18c


Masami Hiramatsu (Google) (2):
      tracing: Allow tracer to add more than 32 options
      tracing: Add an option to show symbols in _text+offset for function profiler

Steven Rostedt (6):
      Merge branch 'topic/func-profiler-offset' of git://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux into trace/trace/core
      tracing: Hide __NR_utimensat and _NR_mq_timedsend when not defined
      tracing: Remove dummy options and flags
      tracing: Have add_tracer_options() error pass up to callers
      tracing: Exit out immediately after update_marker_trace()
      tracing: Use switch statement instead of ifs in set_tracer_flag()

----
 kernel/trace/blktrace.c              |   6 +-
 kernel/trace/ftrace.c                |  26 +++-
 kernel/trace/trace.c                 | 274 ++++++++++++++++++-----------------
 kernel/trace/trace.h                 |  40 ++---
 kernel/trace/trace_events.c          |   4 +-
 kernel/trace/trace_events_synth.c    |   2 +-
 kernel/trace/trace_fprobe.c          |   6 +-
 kernel/trace/trace_functions_graph.c |  18 +--
 kernel/trace/trace_irqsoff.c         |  30 ++--
 kernel/trace/trace_kdb.c             |   2 +-
 kernel/trace/trace_kprobe.c          |   6 +-
 kernel/trace/trace_output.c          |  18 +--
 kernel/trace/trace_output.h          |  11 ++
 kernel/trace/trace_sched_wakeup.c    |  24 +--
 kernel/trace/trace_syscalls.c        |   8 +-
 15 files changed, 265 insertions(+), 210 deletions(-)