Merge branch 'x86/cache' into perf/core, to resolve conflicts

Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.

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

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/include/asm/perf_event.h
Simple merge