diff options
author | Rafael J. Wysocki | 2022-01-10 17:57:13 +0100 |
---|---|---|
committer | Rafael J. Wysocki | 2022-01-10 17:57:13 +0100 |
commit | c001a52df4b6f90bfbfb4a6d6721aa7cd2bf2ebd (patch) | |
tree | 97dc6826f73d7880066f6dc02c2e0a166908df05 /fs/dlm/netlink.c | |
parent | 5561f25beb30bfd95559972858125320411e00d9 (diff) | |
parent | 7dfc5b6e909e8c434ce458d61c7d7c8cd95d5ad6 (diff) | |
parent | 50a4606655582f310b3f07c9492af9a72b40003b (diff) | |
parent | 74d9555580c48a04b2c3b742dfb0c80777aa0b26 (diff) |
Merge branches 'pm-cpuidle', 'pm-core' and 'pm-sleep'
Merge cpuidle updates, PM core updates and one hiberation-related
update for 5.17-rc1:
- Make cpuidle use default_groups in kobj_type (Greg Kroah-Hartman).
- Fix two comments in cpuidle code (Jason Wang, Yang Li).
- Simplify locking in pm_runtime_put_suppliers() (Rafael Wysocki).
- Add safety net to supplier device release in the runtime PM core
code (Rafael Wysocki).
- Capture device status before disabling runtime PM for it (Rafael
Wysocki).
- Add new macros for declaring PM operations to allow drivers to
avoid guarding them with CONFIG_PM #ifdefs or __maybe_unused and
update some drivers to use these macros (Paul Cercueil).
- Allow ACPI hardware signature to be honoured during restore from
hibernation (David Woodhouse).
* pm-cpuidle:
cpuidle: use default_groups in kobj_type
cpuidle: Fix cpuidle_remove_state_sysfs() kerneldoc comment
cpuidle: menu: Fix typo in a comment
* pm-core:
PM: runtime: Simplify locking in pm_runtime_put_suppliers()
mmc: mxc: Use the new PM macros
mmc: jz4740: Use the new PM macros
PM: runtime: Add safety net to supplier device release
PM: runtime: Capture device status before disabling runtime PM
PM: core: Add new *_PM_OPS macros, deprecate old ones
PM: core: Redefine pm_ptr() macro
r8169: Avoid misuse of pm_ptr() macro
* pm-sleep:
PM: hibernate: Allow ACPI hardware signature to be honoured