Merge branch 'linus' into x86/hyperv

Pick up upstream fixes to avoid conflicts.

diff --cc arch/x86/hyperv/hv_apic.c
Simple merge

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

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