Merge branch 'linus' into x86/apic

Pull in upstream changes to avoid conflicts

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

diff --cc arch/x86/kernel/irq.c
index 7ed9cba,c7dfe1b..bc28496
--- 1/arch/x86/kernel/irq.c
--- 2/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -347,9 -347,13 +347,14 @@@ int check_irq_vectors_for_cpu_disable(v
                        if (!desc)
                                continue;
  
+                       /*
+                        * Protect against concurrent action removal,
+                        * affinity changes etc.
+                        */
+                       raw_spin_lock(&desc->lock);
                        data = irq_desc_get_irq_data(desc);
 -                      cpumask_copy(&affinity_new, data->affinity);
 +                      cpumask_copy(&affinity_new,
 +                                   irq_data_get_affinity_mask(data));
                        cpumask_clear_cpu(this_cpu, &affinity_new);
  
                        /* Do not count inactive or per-cpu irqs. */