Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/trace_events.h
Simple merge

diff --cc include/uapi/linux/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

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

diff --cc kernel/trace/trace_probe.h
Simple merge

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

diff --cc tools/include/uapi/linux/perf_event.h
Simple merge