Merge 'v4.12-rc1' into MTD

Bring a few queued patches in sync for -next development.

1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index be3c34e4f2ac..686be4b73018 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -348,7 +348,10 @@ void handle_nested_irq(unsigned int irq)
         irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
         raw_spin_unlock_irq(&desc->lock);
 
-        action_ret = action->thread_fn(action->irq, action->dev_id);
+        action_ret = IRQ_NONE;
+        for_each_action_of_desc(desc, action)
+                action_ret |= action->thread_fn(action->irq, action->dev_id);
+
         if (!noirqdebug)
                 note_interrupt(desc, action_ret);