git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace/for-next

Head SHA1: 80c3e28528ff9f269937fcfe73895213a2e14905


Masami Hiramatsu (Google) (3):
      tracing/hist: Add poll(POLLIN) support on hist file
      tracing/hist: Support POLLPRI event for poll on histogram
      selftests/tracing: Add hist poll() support test

Steven Rostedt (1):
      tracing: Fix using ret variable in tracing_set_tracer()

----
 include/linux/trace_events.h                       | 14 ++++
 kernel/trace/trace.c                               |  3 +-
 kernel/trace/trace_events.c                        | 14 ++++
 kernel/trace/trace_events_hist.c                   | 93 +++++++++++++++++++++-
 tools/testing/selftests/ftrace/Makefile            |  2 +
 tools/testing/selftests/ftrace/poll.c              | 74 +++++++++++++++++
 .../ftrace/test.d/trigger/trigger-hist-poll.tc     | 74 +++++++++++++++++
 7 files changed, 269 insertions(+), 5 deletions(-)
 create mode 100644 tools/testing/selftests/ftrace/poll.c
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-poll.tc