From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2026 19:27:17 +0000 (-0700)
Subject: Merge tag 'thermal-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: ceph-for-7.1-rc1~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c2b23a275ceb52c7a0eeab6556f56e7257b2230;p=ceph-client.git

Merge tag 'thermal-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
 "This prevents the int340x thermal driver from taking the power slider
  offset parameter into account incorrectly in some cases (Srinivas
  Pandruvada)"

* tag 'thermal-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: int340x: soc_slider: Set offset only for balanced mode
---

9c2b23a275ceb52c7a0eeab6556f56e7257b2230