summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-04-28 21:57:00 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-04-28 21:57:00 +0300
commit3c76fe74368b79d5341decaccce97f45907395f1 (patch)
tree213d10af97e64c571a35f3ff9d323a231b0d82aa /kernel
parent659ed6e2850c7df4eba838863325f6d71f437844 (diff)
parenta12475f91b69cce067e5de905fafa893ae12c3ae (diff)
downloadlinux-3c76fe74368b79d5341decaccce97f45907395f1.tar.xz
Merge tag 'thermal-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki: "These take back recent chages that started to confuse users and fix up an attr.show callback prototype in a driver. Specifics: - Stop warning about deprecation of the userspace thermal governor and cooling device status interface, because there are cases in which user space has to drive thermal management with the help of them (Daniel Lezcano) - Fix attr.show callback prototype in the int340x thermal driver (Kees Cook)" * tag 'thermal-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal/governor: Remove deprecated information Revert "thermal/core: Deprecate changing cooling device state from userspace" thermal: int340x: Fix attr.show callback prototype
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions