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

Head SHA1: 8ec8405f081e1e0f800b20f683451c37e81e26c1


Chris Wilson (3):
      tracing: Default to using trace_global_clock if sched_clock is unstable
      tracing: Mention trace_clock=global when warning about unstable clocks
      tracing: Fixup logic inversion on setting trace_global_clock defaults

Dan Carpenter (2):
      tracing: Fix a potential NULL dereference
      tracing: Uninitialized variable in create_tracing_map_fields()

Salvatore Mesoraca (1):
      ftrace: Drop a VLA in module_exists()

Steven Rostedt (VMware) (8):
      init: Fix initcall0 name as it is "pure" not "early"
      vsprintf: Do not preprocess non-dereferenced pointers for bprintf (%px 
and %pK)
      lockdep: Add print_irqtrace_events() to __warn
      ring-buffer: Check if memory is available before allocation
      ring-buffer: Add set/clear_current_oom_origin() during allocations
      tracing: Hide global trace clock from lockdep
      tracing: Add rcu dereference annotation for filter->prog
      tracing: Add rcu dereference annotation for test func that touches 
filter->prog

Tom Zanussi (4):
      tracing: Fix display of hist trigger expressions containing timestamps
      tracing: Don't add flag strings when displaying variable references
      tracing: Add action comparisons when testing matching hist triggers
      tracing: Make sure variable string fields are NULL-terminated

----
 init/main.c                        |  2 +-
 kernel/panic.c                     |  2 +
 kernel/trace/ftrace.c              |  7 ++--
 kernel/trace/ring_buffer.c         | 54 +++++++++++++++++++++-----
 kernel/trace/trace.c               | 19 ++++++++++
 kernel/trace/trace_clock.c         |  4 +-
 kernel/trace/trace_events_filter.c | 10 ++++-
 kernel/trace/trace_events_hist.c   | 78 +++++++++++++++++++++++++++++---------
 lib/vsprintf.c                     |  4 ++
 9 files changed, 143 insertions(+), 37 deletions(-)

Reply via email to