From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jan 2023 21:01:36 +0000 (-0800)
Subject: Merge tag 'thermal-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v6.6.7~3665
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=274d2f8b0c032ca3c1ae88194b75edd2669368b0;p=platform%2Fkernel%2Flinux-starfive.git

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
---

274d2f8b0c032ca3c1ae88194b75edd2669368b0