I'll let these sit in linux-next for a day or two before pushing to Linus.
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 545a028190dae4437aac4f86da7c8ab20857647c
Naveen N. Rao (4):
ftrace: Simplify glob handling in unregister_ftrace_function_probe_func()
ftrace/instances: Clear function triggers when removing instances
selftests/ftrace: Fix bashisms
selftests/ftrace: Add test to remove instance with active event triggers
Steven Rostedt (1):
tracing: Move postpone selftests to core from early_initcall
Steven Rostedt (VMware) (2):
ftrace: Remove #ifdef from code and add clear_ftrace_function_probes()
stub
kprobes: Document how optimized kprobes are removed from module unload
Thomas Gleixner (1):
tracing/kprobes: Enforce kprobes teardown after testing
----
include/linux/kprobes.h | 3 +++
kernel/kprobes.c | 8 +++++++-
kernel/trace/ftrace.c | 12 ++++++++++--
kernel/trace/trace.c | 3 ++-
kernel/trace/trace.h | 5 +++++
kernel/trace/trace_kprobe.c | 5 +++++
tools/testing/selftests/ftrace/ftracetest | 2 +-
.../selftests/ftrace/test.d/ftrace/func_event_triggers.tc | 2 +-
tools/testing/selftests/ftrace/test.d/functions | 4 ++--
.../selftests/ftrace/test.d/instances/instance-event.tc | 8 ++++++--
10 files changed, 42 insertions(+), 10 deletions(-)
