Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict

Signed-off-by: Ingo Molnar <[email protected]>

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

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

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

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

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

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

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