diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-11 14:22:35 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-11 14:22:35 +0200 |
commit | bddce1c7a5ab3ec2dd0fc404f4155c0c17e847b2 (patch) | |
tree | b2df423a624587798ed23de6566a7333e4868852 /scripts/bpf_doc.py | |
parent | 971e2c87e4a9f6321523cf1b4a00d1d4d1aa39b3 (diff) | |
parent | 449c9c02537a146ac97ef962327a221e21c9cab3 (diff) | |
parent | e0423541477dfb684fbc6e6b5386054bc650f264 (diff) |
Merge branches 'pm-sleep' and 'pm-em'
Merge a hibernation regression fix and an fix related to energy model
management for 6.17-rc6
* pm-sleep:
PM: hibernate: Restrict GFP mask in hibernation_snapshot()
* pm-em:
PM: EM: Add function for registering a PD without capacity update