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

Head SHA1: 2413ec4fd11248ef255f92fd12d943b49b6fbff4


Jianlin Lv (1):
      tracepoint: Allow livepatch module add trace event

Ross Zwisler (1):
      tracing: Always use canonical ftrace path

Wang ShaoBo (1):
      tracing: Remove unnecessary NULL assignment

----
 include/linux/kernel.h                    |  2 +-
 include/linux/tracepoint.h                |  4 ++--
 kernel/trace/Kconfig                      | 20 ++++++++++----------
 kernel/trace/kprobe_event_gen_test.c      |  2 +-
 kernel/trace/ring_buffer.c                |  2 +-
 kernel/trace/synth_event_gen_test.c       |  2 +-
 kernel/trace/trace.c                      |  2 +-
 kernel/trace/trace_events.c               |  2 --
 kernel/tracepoint.c                       |  4 ++--
 samples/user_events/example.c             |  4 ++--
 scripts/tracing/draw_functrace.py         |  6 +++---
 tools/lib/api/fs/tracing_path.c           |  4 ++--
 tools/tracing/latency/latency-collector.c |  2 +-
 13 files changed, 27 insertions(+), 29 deletions(-)