Merge branch 'core/urgent' into x86/fpu, to merge fixes

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

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

diff --cc arch/x86/kernel/fpu/xstate.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

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