From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 May 2023 20:55:46 +0000 (-0700)
Subject: Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=77af1f2b9a2464e4bce20cfd32bfb2390c67de7c;p=people%2Fpauldu%2Flinux.git

Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/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
---

77af1f2b9a2464e4bce20cfd32bfb2390c67de7c