Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

diff --cc kernel/jump_label.c
Simple merge

diff --cc kernel/lockdep.c
Simple merge

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

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

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