diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:16:03 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 15:16:03 +0200 |
commit | bf224871c27a7c7e2146d667176977ffe3752750 (patch) | |
tree | 1b0d0e3470d984d21bca59ba31a0edca5724737e /kernel | |
parent | 78b1f56a6f9623d5ac42dc2e9860a58273e8ccae (diff) | |
parent | ffc843fc9c7a407474c5ebcd5dce63bcbfc0f7c0 (diff) | |
parent | a60ec4485f1c72dfece365cf95e6de82bdd74300 (diff) | |
parent | e68cb15bdc93b076eb222e6e435f89532d5a12e8 (diff) | |
download | lwn-bf224871c27a7c7e2146d667176977ffe3752750.tar.gz lwn-bf224871c27a7c7e2146d667176977ffe3752750.zip |
Merge branches 'pm-sleep', 'powercap' and 'pm-tools'
Merge updates related to system sleep handling, one power capping update
and one PM utility update for 6.7-rc1:
- Use __get_safe_page() rather than touching the list in hibernation
snapshot code (Brian Geffon).
- Fix symbol export for _SIMPLE_ variants of _PM_OPS() (Raag Jadav).
- Clean up sync_read handling in snapshot_write_next() (Brian Geffon).
- Fix kerneldoc comments for swsusp_check() and swsusp_close() to
better match code (Christoph Hellwig).
- Downgrade BIOS locked limits pr_warn() in the Intel RAPL power
capping driver to pr_debug() (Ville Syrjälä).
- Change the minimum python version for the intel_pstate_tracer utility
from 2.7 to 3.6 (Doug Smythies).
* pm-sleep:
PM: hibernate: fix the kerneldoc comment for swsusp_check() and swsusp_close()
PM: hibernate: Clean up sync_read handling in snapshot_write_next()
PM: sleep: Fix symbol export for _SIMPLE_ variants of _PM_OPS()
PM: hibernate: Use __get_safe_page() rather than touching the list
* powercap:
powercap: intel_rapl: Downgrade BIOS locked limits pr_warn() to pr_debug()
* pm-tools:
tools/power/x86/intel_pstate_tracer: python minimum version