Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes

diff --cc arch/powerpc/sysdev/ppc4xx_hsta_msi.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc drivers/irqchip/irq-mips-gic.c
Simple merge

diff --cc drivers/irqchip/spear-shirq.c
Simple merge

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

diff --cc kernel/irq/internals.h
Simple merge

diff --cc kernel/irq/resend.c
index 32fc47c,7a5237a..dd95f44
--- 1/kernel/irq/resend.c
--- 2/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@@ -74,16 -74,22 +74,24 @@@ void check_irq_resend(struct irq_desc *
                if (!desc->irq_data.chip->irq_retrigger ||
                    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {
  #ifdef CONFIG_HARDIRQS_SW_RESEND
 +                      unsigned int irq = irq_desc_get_irq(desc);
 +
                        /*
-                        * If the interrupt has a parent irq and runs
-                        * in the thread context of the parent irq,
-                        * retrigger the parent.
+                        * If the interrupt is running in the thread
+                        * context of the parent irq we need to be
+                        * careful, because we cannot trigger it
+                        * directly.
                         */
-                       if (desc->parent_irq &&
-                           irq_settings_is_nested_thread(desc))
+                       if (irq_settings_is_nested_thread(desc)) {
+                               /*
+                                * If the parent_irq is valid, we
+                                * retrigger the parent, otherwise we
+                                * do nothing.
+                                */
+                               if (!desc->parent_irq)
+                                       return;
                                irq = desc->parent_irq;
+                       }
                        /* Set it pending and activate the softirq: */
                        set_bit(irq, irqs_resend);
                        tasklet_schedule(&resend_tasklet);