Merge tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Feb 2025 23:07:11 +0000 (15:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Feb 2025 23:07:11 +0000 (15:07 -0800)
commit3f2ca7b8b33db7d094ef729e6b0707b5534159b0
treefde3e8a58a05976f2c6206c3d46b85abdc007b86
parentf92a80bdb445e4e73e810ea7e94bebb10717f40a
parenta6768c4f92e152265590371975d44c071a5279c7
Merge tag 'thermal-6.14-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull thermal control fixes from Rafael Wysocki:
 "Fix a regression caused by an inadvertent change of the
  THERMAL_GENL_ATTR_CPU_CAPABILITY value in one of the recent thermal
  commits (Zhang Rui) and drop a stale piece of documentation (Daniel
  Lezcano)"

* tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/cpufreq_cooling: Remove structure member documentation
  thermal/netlink: Prevent userspace segmentation fault by adjusting UAPI header