Commit 042f99c493c2 for kernel
commit 042f99c493c2cef3b15de2df19c06df514d39ac7
Merge: 6a28fb8cb28b a8d51efb5929
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu Mar 26 18:44:46 2026 +0100
Merge branch 'pm-sleep'
Merge fixes related to system sleep for 7.0-rc6:
- Prevent pm_restore_gfp_mask() from triggering a WARN_ON() in some
code paths in which it is legitimately called without invoking
pm_restrict_gfp_mask() previously (Youngjun Park)
- Update snapshot_write_finalize() to take trailing zero pages into
account properly which prevents user space restore from failing
subsequently in some cases (Alberto Garcia)
* pm-sleep:
PM: sleep: Drop spurious WARN_ON() from pm_restore_gfp_mask()
PM: hibernate: Drain trailing zero pages on userspace restore