]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branches 'pm-sleep' and 'pm-em'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 11 Sep 2025 12:22:35 +0000 (14:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 11 Sep 2025 12:22:35 +0000 (14:22 +0200)
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


Trivial merge