diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-16 12:33:15 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-16 12:33:15 +0100 |
commit | dd75558b2d0b5e2b36ec0ef7e494d2763517d801 (patch) | |
tree | 13edfae1996791e9a7c78a9a68bfc4509e1cb1cc | |
parent | 17e8b76491b007698cf63bc10093bc8991e45001 (diff) | |
parent | 6dcb35088e264306b948141971286257681ca412 (diff) | |
parent | 97566d09fd02d2ab329774bb89a2cdf2267e86d9 (diff) |
Merge branches 'thermal-core' and 'thermal-intel'
Merge additional updates for 6.8-rc1 in the thermal core and in the
Intel HFI thermal driver:
- Add debugfs-based diagnostics support to the thermal core (Daniel
Lezcano, Dan Carpenter).
- Fix a power allocator thermal governor issue preventing it from
resetting cooling devices sometimes (Di Shen).
- Simplify the thermal netlink API and clean up related code (Rafael J.
Wysocki).
- Make the Intel HFI driver support hibernation and deep suspend
properly (Ricardo Neri).
* thermal-core:
thermal/debugfs: Unlock on error path in thermal_debug_tz_trip_up()
thermal: gov_power_allocator: avoid inability to reset a cdev
thermal: helpers: Rearrange thermal_cdev_set_cur_state()
thermal: netlink: Rework notify API for cooling devices
thermal: core: Use kstrdup_const() during cooling device registration
thermal/debugfs: Add thermal debugfs information for mitigation episodes
thermal/debugfs: Add thermal cooling device debugfs information
thermal: netlink: Pass thermal zone pointer to notify routines
thermal: netlink: Drop thermal_notify_tz_trip_add/delete()
thermal: netlink: Pass pointers to thermal_notify_tz_trip_up/down()
thermal: netlink: Pass pointers to thermal_notify_tz_trip_change()
* thermal-intel:
thermal: intel: hfi: Add syscore callbacks for system-wide PM