From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Dec 2024 18:44:44 +0000 (-0800)
Subject: Merge tag 'thermal-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v6.13-rc4~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be6bb3619eeda0cd3a52ead9e63c5795ac87f0c5;p=thirdparty%2Flinux.git

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

Pull thermal control fixes from Rafael Wysocki:
 "Fix two issues with the user thermal thresholds feature introduced in
  this development cycle (Daniel Lezcano)"

* tag 'thermal-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/thresholds: Fix boundaries and detection routine
  thermal/thresholds: Fix uapi header macros leading to a compilation error
---

be6bb3619eeda0cd3a52ead9e63c5795ac87f0c5