From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 11 Sep 2025 12:22:35 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-em'
X-Git-Tag: v6.17-rc6~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bddce1c7a5ab3ec2dd0fc404f4155c0c17e847b2;p=thirdparty%2Fkernel%2Fstable.git

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
---

bddce1c7a5ab3ec2dd0fc404f4155c0c17e847b2