Merge remote-tracking branch 'ftrace/for-next'

# Conflicts:
#	arch/x86/kernel/kprobes/ftrace.c

diff --cc include/trace/events/io_uring.h
Simple merge

diff --cc include/trace/events/rcu.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge