Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv...

diff --cc arch/x86/coco/sev/core.c
Simple merge

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

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

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

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

diff --cc arch/x86/include/asm/mshyperv.h
index 778444310cfbfe631771aea701f14954b05e1209,5ec92e3e2e37655af0604cd6259f0fbf92c51c58..e1752ba47e670b87bf96a80b62a45faf8361bfe8
--- 1/arch/x86/include/asm/mshyperv.h
--- 2/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@@ -305,8 -305,9 +306,9 @@@ void hv_set_non_nested_msr(unsigned in
  
  static __always_inline u64 hv_raw_get_msr(unsigned int reg)
  {
 -      return __rdmsr(reg);
 +      return native_rdmsrq(reg);
  }
+ int hv_apicid_to_vp_index(u32 apic_id);
  
  #else /* CONFIG_HYPERV */
  static inline void hyperv_init(void) {}

diff --cc arch/x86/kernel/apic/apic_numachip.c
Simple merge

diff --cc drivers/hv/vmbus_drv.c
Simple merge

diff --cc drivers/pci/controller/pci-hyperv.c
Simple merge

diff --cc include/hyperv/hvgdk_mini.h
Simple merge

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

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