Chengming Zhou (1):
      tracefs: Remove SLAB_MEM_SPREAD flag usage

Huang Yiwei (1):
      tracing: Support to dump instance traces by ftrace_dump_on_oops

Steven Rostedt (Google) (4):
      tracepoints: Use WARN() and not WARN_ON() for warnings
      ring-buffer: Have mmapped ring buffer keep track of missed events
      net: hns3: tracing: fix hclgevf trace event strings
      tracing: Use strcmp() in __assign_str() WARN_ON() check

Thorsten Blum (1):
      tracing: Use div64_u64() instead of do_div()

linke li (1):
      ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment

----
 Documentation/admin-guide/kernel-parameters.txt    |  26 +++-
 Documentation/admin-guide/sysctl/kernel.rst        |  30 +++-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h   |   8 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h |   8 +-
 fs/tracefs/inode.c                                 |   1 -
 include/linux/ftrace.h                             |   4 +-
 include/linux/kernel.h                             |   1 +
 include/linux/tracepoint.h                         |   6 +-
 include/trace/stages/stage6_event_callback.h       |   4 +-
 kernel/sysctl.c                                    |   4 +-
 kernel/trace/ring_buffer.c                         |  55 +++++++-
 kernel/trace/trace.c                               | 156 +++++++++++++++------
 kernel/trace/trace_benchmark.c                     |   5 +-
 kernel/trace/trace_selftest.c                      |   2 +-
 14 files changed, 233 insertions(+), 77 deletions(-)