Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix

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

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

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

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