From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Feb 2025 23:07:11 +0000 (-0800)
Subject: Merge tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3f2ca7b8b33db7d094ef729e6b0707b5534159b0;p=users%2Fdwmw2%2Flinux.git

Merge tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/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
---

3f2ca7b8b33db7d094ef729e6b0707b5534159b0