Beau Belgrave (4):
      tracing/user_events: Prepare find/delete for same name events
      tracing/user_events: Introduce multi-format events
      selftests/user_events: Test multi-format events
      tracing/user_events: Document multi-format flag

John Garry (1):
      tracing: Use init_utsname()->release

Steven Rostedt (Google) (8):
      NFSD: Fix nfsd_clid_class use of __string_len() macro
      drm/i915: Add missing ; to __assign_str() macros in tracepoint code
      tracing: Rework __assign_str() and __string() to not duplicate getting the string
      tracing: Do not calculate strlen() twice for __string() fields
      tracing: Use ? : shortcut in trace macros
      tracing: Use EVENT_NULL_STR macro instead of open coding "(null)"
      tracing: Fix snapshot counter going between two tracers that use it
      tracing: Decrement the snapshot if the snapshot trigger fails to register

----
 Documentation/trace/user_events.rst                |  27 ++-
 drivers/gpu/drm/i915/display/intel_display_trace.h |   6 +-
 fs/nfsd/trace.h                                    |   2 +-
 include/linux/trace_events.h                       |   3 +
 include/trace/events/sunrpc.h                      |  12 +-
 include/trace/stages/stage2_data_offsets.h         |   4 +-
 include/trace/stages/stage5_get_offsets.h          |  15 +-
 include/trace/stages/stage6_event_callback.h       |  12 +-
 include/uapi/linux/user_events.h                   |   6 +-
 kernel/trace/trace.c                               |   6 +-
 kernel/trace/trace_events_trigger.c                |   5 +-
 kernel/trace/trace_events_user.c                   | 209 +++++++++++++++------
 tools/testing/selftests/user_events/abi_test.c     | 134 +++++++++++++
 13 files changed, 354 insertions(+), 87 deletions(-)