This should have gone out a while ago, but due to traveling and
system updates of my home office, it was delayed.
-- Steve
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 7cf19b391f18a230dc989928334a9b8d10b1bf51
Arnd Bergmann (2):
tracing: always define trace_{irq,preempt}_{enable_disable}
tracing: make PREEMPTIRQ_EVENTS depend on TRACING
Changbin Du (1):
tracing: Allocate mask_str buffer dynamically
Chunyu Hu (1):
tracing: Fix code comments in trace.c
Felipe Balbi (1):
tracing: Pass export pointer as argument to ->write()
Matthias Kaehlcke (1):
ring-buffer: Remove unused function __rb_data_page_index()
Steven Rostedt (VMware) (1):
tracing: Have stack trace not record if RCU is not watching
----
drivers/hwtracing/stm/ftrace.c | 6 ++++--
include/linux/trace.h | 2 +-
include/trace/events/preemptirq.h | 11 +++++++----
kernel/trace/Kconfig | 1 +
kernel/trace/ring_buffer.c | 6 ------
kernel/trace/trace.c | 41 ++++++++++++++-------------------------
kernel/trace/trace_stack.c | 4 ++++
7 files changed, 32 insertions(+), 39 deletions(-)
