From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2024 16:41:57 +0000 (-0700)
Subject: Merge tag 'thermal-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: for-linus-6.9~59
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbe0a7be283829566c966642c739e820e0be1081;p=users%2Fdwmw2%2Flinux.git

Merge tag 'thermal-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
 "This prevents the thermal debug code from attempting to divide by zero
  and corrects trip point statistics (Rafael Wysocki)"

* tag 'thermal-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()
---

dbe0a7be283829566c966642c739e820e0be1081