Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 May 2023 20:55:46 +0000 (13:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 May 2023 20:55:46 +0000 (13:55 -0700)
commit77af1f2b9a2464e4bce20cfd32bfb2390c67de7c
treec5d663393bd66e98ffa52e188145e8f7a2ae1973
parentc551afcdc373eb66d12e08ed0434711c9a10ca2b
parent5f7fdb0f255756b594cc45c2c08b0140bc4a1761
Merge tag 'thermal-6.4-rc4' of git://git./linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
 "Fix a regression introduced inadvertently during the 6.3 cycle by a
  commit making the Intel int340x thermal driver use sysfs_emit_at()
  instead of scnprintf() (Srinivas Pandruvada)"

* tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: int340x: Add new line for UUID display