Merge tag 'thermal-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2023 21:01:36 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2023 21:01:36 +0000 (13:01 -0800)
commit274d2f8b0c032ca3c1ae88194b75edd2669368b0
treeadfea978b5327f7e2fab1bff9accd902526e126a
parent0d1e013fd9246fcf73a078999487ba47d1dd1bb9
parentacd7e9ee57c880b99671dd99680cb707b7b5b0ee
Merge tag 'thermal-6.2-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull thermal control fixes from Rafael Wysocki:
 "Add locking to the Intel int340x thermal control driver to prevent its
  thermal zone callbacks from racing with firmware-induced thermal trip
  point updates (Srinivas Pandruvada, Rafael Wysocki)"

* tag 'thermal-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type()
  thermal: intel: int340x: Protect trip temperature from concurrent updates