diff options
author | Rafael J. Wysocki | 2022-03-18 18:29:21 +0100 |
---|---|---|
committer | Rafael J. Wysocki | 2022-03-18 18:29:21 +0100 |
commit | dfad78e07e93decdd5361c08473ea66898b817c7 (patch) | |
tree | 9f5450657a9c43ae0d2e0a75a086127667e83b11 /drivers/base | |
parent | 86c17c40d290cee7353f9bf531f7adb3c88675c5 (diff) | |
parent | f6c46b1d62f8ffbf2cf6eb43ab0d277bd3f7e948 (diff) | |
parent | f6bfe8b5b2c2a5ac8bd2fc7bca3706e6c3fc26d8 (diff) | |
parent | a644161ba11df38e5582e718c99668e282ddbf36 (diff) |
Merge branches 'pm-sleep', 'pm-domains' and 'pm-docs'
Merge changes related to system sleep, PM domains changes and power
management documentation changes for 5.18-rc1:
- Fix load_image_and_restore() error path (Ye Bin).
- Fix typos in comments in the system wakeup hadling code (Tom Rix).
- Clean up non-kernel-doc comments in hibernation code (Jiapeng
Chong).
- Fix __setup handler error handling in system-wide suspend and
hibernation core code (Randy Dunlap).
- Add device name to suspend_report_result() (Youngjin Jang).
- Make virtual guests honour ACPI S4 hardware signature by
default (David Woodhouse).
- Block power off of a parent PM domain unless child is in deepest
state (Ulf Hansson).
- Use dev_err_probe() to simplify error handling for generic PM
domains (Ahmad Fatoum).
- Fix sleep-in-atomic bug caused by genpd_debug_remove() (Shawn Guo).
- Document Intel uncore frequency scaling (Srinivas Pandruvada).
* pm-sleep:
PM: hibernate: Honour ACPI hardware signature by default for virtual guests
PM: sleep: Add device name to suspend_report_result()
PM: suspend: fix return value of __setup handler
PM: hibernate: fix __setup handler error handling
PM: hibernate: Clean up non-kernel-doc comments
PM: sleep: wakeup: Fix typos in comments
PM: hibernate: fix load_image_and_restore() error path
* pm-domains:
PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
PM: domains: use dev_err_probe() to simplify error handling
PM: domains: Prevent power off for parent unless child is in deepest state
* pm-docs:
Documentation: admin-guide: pm: Document uncore frequency scaling