From: Thomas Gleixner <tglx@kernel.org>
Date: Thu, 26 Mar 2026 15:14:33 +0000 (+0100)
Subject: Merge branch 'irq/urgent' into irq/drivers
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87c6dfe308afb9d514006bb42ca2dad301f4ad75;p=thirdparty%2Flinux.git

Merge branch 'irq/urgent' into irq/drivers

to fixup a trivial conflict with pending upstream fixes.
---

87c6dfe308afb9d514006bb42ca2dad301f4ad75
diff --cc drivers/irqchip/irq-renesas-rzv2h.c
index ce790590f7ca9,03e93b061edde..31f191641ff8f
--- a/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;
  }