Li zeming (1):
      tracepoints: It is CONFIG_TRACEPOINTS not CONFIG_TRACEPOINT

Masami Hiramatsu (Google) (1):
      tracing/eprobe: Show syntax error logs in error_log file

Slark Xiao (1):
      scripts/tracing: Fix typo 'the the' in comment

Steven Rostedt (Google) (1):
      tracing: Use alignof__(struct {type b;}) instead of offsetof()

Zhiqiang Liu (1):
      tracing: Use free_trace_buffer() in allocate_trace_buffers()

----
 include/linux/tracepoint.h                 |  2 +-
 include/trace/stages/stage4_event_fields.h |  2 +-
 kernel/trace/trace.c                       | 25 +++++++++++--------------
 kernel/trace/trace_eprobe.c                | 11 +++++++++--
 kernel/trace/trace_probe.h                 |  5 ++++-
 scripts/tracing/draw_functrace.py          |  2 +-
 6 files changed, 27 insertions(+), 20 deletions(-)