Merge branch 'perf/urgent' into perf/core, before applying dependent patches

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

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel_uncore.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel_uncore.h
Simple merge

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

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