diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-08 23:23:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-08 23:23:37 +0200 |
| commit | 033c88d58b66a5bf61a9a4f0029c4fb771f0555e (patch) | |
| tree | 3d98f3f250c3b60785e5be4d66b7f7eb7a457d20 /include/trace/events/power.h | |
| parent | Merge tag 'sysctl-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| parent | Merge branches 'thermal-core' and 'thermal-tools' (diff) | |
| download | linux-033c88d58b66a5bf61a9a4f0029c4fb771f0555e.tar.xz linux-033c88d58b66a5bf61a9a4f0029c4fb771f0555e.zip | |
Merge tag 'thermal-5.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more thermal control updates from Rafael Wysocki:
"These fix an error code path issue leading to a NULL pointer
dereference, drop Kconfig dependencies that are not needed any more
after recent changes, add CPU IDs for new chips to a driver and fix up
the tmon utility.
Specifics:
- Fix NULL pointer dereference in the thermal sysfs interface that
results from an error code path mishandling (Rafael Wysocki).
- Drop COMPILE_TEST dependency that's not needed any more from two
thermal Kconfig entries (Jean Delvare).
- Make the Intel TCC cooling driver support Alder Lake-N and Raptor
Lake-P (Sumeet Pawnikar).
- Fix possible path truncations in the tmon utility (Florian
Fainelli)"
* tag 'thermal-5.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
tools/thermal: Fix possible path truncations
thermal: Drop obsolete dependency on COMPILE_TEST
thermal: sysfs: Fix cooling_device_stats_setup() error code path
thermal: intel: Add TCC cooling support for Alder Lake-N and Raptor Lake-P
Diffstat (limited to 'include/trace/events/power.h')
0 files changed, 0 insertions, 0 deletions