Merge branch 'irq/urgent' into x86/apic

Pick up core changes which affect the vector rework.

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc kernel/irq/chip.c
index 82333835ac66ee183087eeeb9d8c203c3f702d38,5a2ef92c2782c59c177e1f6c2eb5b4b17fb75a49..043bfc35b3534e45b9e4ec90c230000ea04519d1
--- 1/kernel/irq/chip.c
--- 2/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -271,11 -265,10 +271,11 @@@ int irq_startup(struct irq_desc *desc, 
                        irq_setup_affinity(desc);
                        break;
                case IRQ_STARTUP_MANAGED:
+                       irq_do_set_affinity(d, aff, false);
                        ret = __irq_startup(desc);
-                       irq_set_affinity_locked(d, aff, false);
                        break;
                case IRQ_STARTUP_ABORT:
 +                      irqd_set_managed_shutdown(d);
                        return 0;
                }
        }

diff --cc kernel/irq/irqdomain.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge