Merge branch 'perf/urgent' into perf/core

Merge the latest fixes before queueing up new changes.

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

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

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