Merge branch 'perf/x86' into perf/core, because it's ready

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

diff --cc arch/arm64/kernel/hw_breakpoint.c
Simple merge

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

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

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

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