Qiujun Huang (1):
tracing: Fix the checking of stackidx in __ftrace_trace_stack
Steven Rostedt (VMware) (3):
ring-buffer: Fix recursion protection transitions between interrupt
context
tracing: Make -ENOMEM the default error for parse_synth_field()
kprobes: Tell lockdep about kprobe nesting
----
kernel/kprobes.c | 25 ++++++++++++++---
kernel/trace/ring_buffer.c | 58 +++++++++++++++++++++++++++++++--------
kernel/trace/trace.c | 4 +--
kernel/trace/trace_events_synth.c | 17 +++++-------
4 files changed, 76 insertions(+), 28 deletions(-)