Merge tag 'thermal-v6.18-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 28 Sep 2025 10:01:58 +0000 (12:01 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 28 Sep 2025 10:01:58 +0000 (12:01 +0200)
commit2085f0f4697234a0f59ed718d0e72f38688210e0
tree3b1e172b9280d71fb1c56497522fb1da53db3ceb
parentacbba7f0e5ec9736813dee221cc20f77a7d11d7b
parentdc67521c20b701b5237ff486ae078829dc1f8fea
Merge tag 'thermal-v6.18-rc1-2' of ssh://gitolite./linux/kernel/git/thermal/linux

Merge a thermal driver fix for 6.18 from Daniel Lezcano:

"- Add missing file when importing conflicting change for the Renesas
   RZ/G3E thermal driver (Daniel Lezcano)"

* tag 'thermal-v6.18-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/renesas/rzg3e: Fix add thermal driver for the Renesas RZ/G3E SoC