Merge tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2025 16:47:43 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2025 16:47:43 +0000 (09:47 -0700)
commit7586ac7c340c3672f116052c1d150f134810965b
tree20a79f6e874ec2fad000e4092b31d6b88ea25dce
parente0f8e1a7c18bfbb203122e98dbd08e0e68dcbd76
parentcf948c8e274e8b406e846cdf6cc48fe47f98cf57
Merge tag 'thermal-6.15-rc8' of git://git./linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
 "This fixes a coding mistake in the x86_pkg_temp_thermal Intel thermal
  driver that was introduced by an incorrect conflict resolution during
  a merge (Zhang Rui)"

* tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature