Merge branch 'x86/urgent' into x86/hyperv

Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc arch/x86/hyperv/hv_apic.c
index 657a2b8,4023383..0c3c9f8
--- 1/arch/x86/hyperv/hv_apic.c
--- 2/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@@ -165,6 -160,9 +167,9 @@@ static bool __send_ipi_mask(const struc
  
        for_each_cpu(cur_cpu, mask) {
                vcpu = hv_cpu_number_to_vp_number(cur_cpu);
 -                      goto ipi_mask_done;
+               if (vcpu == VP_INVAL)
++                      return true;
+ 
                /*
                 * This particular version of the IPI hypercall can
                 * only target upto 64 CPUs.

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