Beau Belgrave (3):
      tracing/user_events: Allow events to persist for perfmon_capable users
      selftests/user_events: Test persist flag cases
      tracing/user_events: Document persist event flags

Steven Rostedt (Google) (2):
      eventfs: Remove eventfs_file and just use eventfs_inode
      tracing/selftests: Update kprobe args char/string to match new functions

Uros Bizjak (1):
      ring_buffer: Use try_cmpxchg instead of cmpxchg in rb_insert_pages

Zheng Yejian (1):
      tracing: Expand all ring buffers individually

----
 Documentation/trace/user_events.rst                |  21 +-
 fs/tracefs/event_inode.c                           | 847 +++++++++++----------
 fs/tracefs/inode.c                                 |   2 +-
 fs/tracefs/internal.h                              |  37 +-
 include/linux/trace_events.h                       |   2 +-
 include/linux/tracefs.h                            |  29 +-
 include/uapi/linux/user_events.h                   |  11 +-
 kernel/trace/ring_buffer.c                         |   8 +-
 kernel/trace/trace.c                               |  54 +-
 kernel/trace/trace.h                               |  13 +-
 kernel/trace/trace_events.c                        | 335 +++++---
 kernel/trace/trace_events_user.c                   |  36 +-
 .../ftrace/test.d/kprobe/kprobe_args_char.tc       |   4 +-
 .../ftrace/test.d/kprobe/kprobe_args_string.tc     |   4 +-
 tools/testing/selftests/user_events/abi_test.c     |  55 +-
 tools/testing/selftests/user_events/dyn_test.c     |  54 +-
 16 files changed, 917 insertions(+), 595 deletions(-)