git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: 1a0b112ed1247152685996b4e0edf2af9844ece4 Qiujun Huang (1): ftrace: Fix some typos in comment Steven Rostedt (VMware) (3): tracing: Change synthetic event string format to limit printed length ftrace: Simplify the hash calculation ftrace: Format variable declarations of ftrace_allocate_records Sudip Mukherjee (1): tracing: Remove a pointless assignment Tom Zanussi (6): tracing: Change STR_VAR_MAX_LEN tracing: Fix parse_synth_field() error handling tracing: Save normal string variables tracing: Add support for dynamic strings to synthetic events tracing: Add README information for synthetic_events file selftests/ftrace: Add test case for synthetic event dynamic strings Wei Yang (4): ftrace: Use fls() to get the bits for dup_hash() ftrace: Simplify the dyn_ftrace->flags macro ftrace: Simplify the calculation of page number for ftrace_page->records ftrace: ftrace_global_list is renamed to ftrace_ops_list ---- Documentation/trace/events.rst | 15 +- Documentation/trace/histogram.rst | 18 ++ include/linux/ftrace.h | 11 +- kernel/trace/ftrace.c | 22 +- kernel/trace/synth_event_gen_test.c | 18 +- kernel/trace/trace.c | 8 +- kernel/trace/trace_events_hist.c | 45 +++- kernel/trace/trace_events_synth.c | 256 ++++++++++++++++++--- kernel/trace/trace_synth.h | 6 +- .../trigger-synthetic-event-dynstring.tc | 31 +++ 10 files changed, 366 insertions(+), 64 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc