Linyu Yuan (4):
      tracing: eprobe: Add missing log index
      tracing: eprobe: Remove duplicate is_good_name() operation
      tracing: Auto generate event name when creating a group of events
      selftests/ftrace: Add test case for GRP/ only input

Steven Rostedt (Google) (17):
      tracing: devlink: Use static array for string in devlink_trap_report even
      tracing/ipv4/ipv6: Use static array for name field in fib*_lookup_table event
      neighbor: tracing: Have neigh_create event use __string()
      tracing/events: Add __vstring() and __assign_vstr() helper macros
      tracing/IB/hfi1: Use the new __vstring() helper
      tracing/ath: Use the new __vstring() helper
      tracing/brcm: Use the new __vstring() helper
      tracing/iwlwifi: Use the new __vstring() helper
      usb: chipidea: tracing: Use the new __vstring() helper
      xhci: tracing: Use the new __vstring() helper
      USB: mtu3: tracing: Use the new __vstring() helper
      usb: musb: tracing: Use the new __vstring() helper
      scsi: iscsi: tracing: Use the new __vstring() helper
      scsi: qla2xxx: tracing: Use the new __vstring() helper
      batman-adv: tracing: Use the new __vstring() helper
      mac80211: tracing: Use the new __vstring() helper
      selftests/kprobe: Do not test for GRP/ without event failures

Xiang wangx (1):
      tracing/user_events: Fix syntax errors in comments

Zheng Yejian (1):
      tracing/histograms: Simplify create_hist_fields()

----
 Documentation/trace/kprobetrace.rst                |  8 +++----
 Documentation/trace/uprobetracer.rst               |  8 +++----
 drivers/infiniband/hw/hfi1/trace_dbg.h             |  8 ++-----
 drivers/net/wireless/ath/ath10k/trace.h            | 14 ++++-------
 drivers/net/wireless/ath/ath11k/trace.h            |  7 ++----
 drivers/net/wireless/ath/ath6kl/trace.h            | 14 ++++-------
 drivers/net/wireless/ath/trace.h                   |  7 ++----
 drivers/net/wireless/ath/wil6210/trace.h           |  7 ++----
 .../broadcom/brcm80211/brcmfmac/tracepoint.h       | 12 ++++------
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h  | 12 ++++------
 .../net/wireless/intel/iwlwifi/iwl-devtrace-msg.h  | 12 ++++------
 drivers/usb/chipidea/trace.h                       |  4 ++--
 drivers/usb/host/xhci-trace.h                      |  4 ++--
 drivers/usb/mtu3/mtu3_trace.h                      |  4 ++--
 drivers/usb/musb/musb_trace.h                      |  4 ++--
 include/linux/trace_events.h                       | 18 ++++++++++++++
 include/trace/events/devlink.h                     |  7 +++---
 include/trace/events/fib.h                         |  6 ++---
 include/trace/events/fib6.h                        |  8 +++----
 include/trace/events/iscsi.h                       |  4 ++--
 include/trace/events/neigh.h                       |  2 +-
 include/trace/events/qla.h                         |  4 ++--
 include/trace/stages/stage1_struct_define.h        |  3 +++
 include/trace/stages/stage2_data_offsets.h         |  3 +++
 include/trace/stages/stage4_event_fields.h         |  3 +++
 include/trace/stages/stage5_get_offsets.h          |  4 ++++
 include/trace/stages/stage6_event_callback.h       |  7 ++++++
 kernel/trace/trace.c                               |  8 +++----
 kernel/trace/trace_dynevent.c                      |  2 +-
 kernel/trace/trace_eprobe.c                        | 28 +++++++++++-----------
 kernel/trace/trace_events_hist.c                   |  5 ++--
 kernel/trace/trace_events_user.c                   |  2 +-
 kernel/trace/trace_kprobe.c                        | 16 ++++++++-----
 kernel/trace/trace_probe.c                         |  4 ++++
 kernel/trace/trace_uprobe.c                        | 12 ++++++----
 net/batman-adv/trace.h                             |  7 ++----
 net/mac80211/trace_msg.h                           |  6 ++---
 .../ftrace/test.d/dynevent/add_remove_eprobe.tc    |  9 ++++++-
 .../ftrace/test.d/dynevent/add_remove_kprobe.tc    |  7 ++++++
 .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc   |  1 -
 40 files changed, 160 insertions(+), 141 deletions(-)