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

Head SHA1: bc47ee4844d6b7d7351536cd99d35848c4449689


Beau Belgrave (2):
      user_events: Fix potential uninitialized pointer while parsing field
      user_events: Prevent dyn_event delete racing with ioctl add/delete

Steven Rostedt (Google) (9):
      tracing: Fix allocation of last_cmd in last_cmd_set()
      tracing: Fix last_cmd_set() string management in histogram code
      tracing: Allow custom events to be added to the tracefs directory
      tracing: Add sample code for custom trace events
      tracing: Move the defines to create TRACE_EVENTS into their own files
      tracing: Add TRACE_CUSTOM_EVENT() macro
      tracing: Have TRACE_DEFINE_ENUM affect trace event types as well
      tracing: Add snapshot at end of kernel boot up
      tracing/user_events: Use alloc_pages instead of kzalloc() for register pages

Tom Zanussi (1):
      tracing: Fix strncpy warning in trace_events_synth.c

----
 Documentation/admin-guide/kernel-parameters.txt |   8 +
 include/linux/ftrace.h                          |  11 +-
 include/linux/trace_events.h                    |  24 +-
 include/trace/define_custom_trace.h             |  77 ++++
 include/trace/stages/init.h                     |  37 ++
 include/trace/stages/stage1_defines.h           |  45 +++
 include/trace/stages/stage2_defines.h           |  48 +++
 include/trace/stages/stage3_defines.h           | 129 ++++++
 include/trace/stages/stage4_defines.h           |  57 +++
 include/trace/stages/stage5_defines.h           |  83 ++++
 include/trace/stages/stage6_defines.h           |  86 ++++
 include/trace/stages/stage7_defines.h           |  34 ++
 include/trace/trace_custom_events.h             | 221 +++++++++++
 include/trace/trace_events.h                    | 499 +-----------------------
 kernel/trace/ftrace.c                           |   2 +
 kernel/trace/trace.c                            |  18 +
 kernel/trace/trace_events.c                     |  30 ++
 kernel/trace/trace_events_hist.c                |   9 +-
 kernel/trace/trace_events_synth.c               |   5 +-
 kernel/trace/trace_events_user.c                |  64 ++-
 samples/Kconfig                                 |   8 +-
 samples/Makefile                                |   1 +
 samples/trace_events/Makefile                   |   2 +
 samples/trace_events/trace_custom_sched.c       |  60 +++
 samples/trace_events/trace_custom_sched.h       |  95 +++++
 25 files changed, 1139 insertions(+), 514 deletions(-)
 create mode 100644 include/trace/define_custom_trace.h
 create mode 100644 include/trace/stages/init.h
 create mode 100644 include/trace/stages/stage1_defines.h
 create mode 100644 include/trace/stages/stage2_defines.h
 create mode 100644 include/trace/stages/stage3_defines.h
 create mode 100644 include/trace/stages/stage4_defines.h
 create mode 100644 include/trace/stages/stage5_defines.h
 create mode 100644 include/trace/stages/stage6_defines.h
 create mode 100644 include/trace/stages/stage7_defines.h
 create mode 100644 include/trace/trace_custom_events.h
 create mode 100644 samples/trace_events/trace_custom_sched.c
 create mode 100644 samples/trace_events/trace_custom_sched.h