Merge branch 'linus' into x86/hyperv
authorThomas Gleixner <tglx@linutronix.de>
Fri, 15 Nov 2019 09:30:50 +0000 (10:30 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 15 Nov 2019 09:30:50 +0000 (10:30 +0100)
commitac94be498f84f7327533b62faca4c3da64434904
tree63893f37afb67cd400bf60ec16a35440d16f2a90
parentdce7cd62754b5d4a6e401b8b0769ec94cf971041
parent8c5bd25bf42effd194d4b0b43895c42b374e620b
Merge branch 'linus' into x86/hyperv

Pick up upstream fixes to avoid conflicts.
arch/x86/hyperv/hv_apic.c
arch/x86/include/asm/hyperv-tlfs.h
arch/x86/kernel/cpu/mshyperv.c