Merge branch 'irq/urgent' into irq/drivers

to fixup a trivial conflict with pending upstream fixes.

diff --cc drivers/irqchip/irq-renesas-rzv2h.c
index ce790590f7ca9932d09c3ba1f182dd212b676492,03e93b061edde1ad746ebf7fccd0804cd3ccbd18..31f191641ff8fff4be8ef369d3a1c432b5ff416d
--- 1/drivers/irqchip/irq-renesas-rzv2h.c
--- 2/drivers/irqchip/irq-renesas-rzv2h.c
+++ b/drivers/irqchip/irq-renesas-rzv2h.c
@@@ -884,8 -621,8 +884,7 @@@ static int rzv2h_icu_probe_common(struc
        return 0;
  
  pm_put:
-       pm_runtime_put(dev);
 -      pm_runtime_put_sync(&pdev->dev);
--
++      pm_runtime_put_sync(dev);
        return ret;
  }