git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c
Peter Zijlstra (1):
tracing: Record and show NMI state
Steven Rostedt (Red Hat) (1):
tracing: Fix trace_printk() to print when not using bprintk()
----
include/linux/kernel.h | 6 +++---
kernel/trace/trace.c | 1 +
kernel/trace/trace.h | 1 +
kernel/trace/trace_output.c | 10 +++++++---
kernel/trace/trace_printk.c | 3 +++
5 files changed, 15 insertions(+), 6 deletions(-)
