From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 4 Jul 2025 19:54:55 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: ceph-for-6.17-rc6~478^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=250d0579da5db2052cce2891a5eaa87450851354;p=ceph-client.git

Merge branch 'pm-sleep'

Merge fixes related to system sleep for 6.16-rc5:

 - Fix typo in the ABI documentation (Sumanth Gavini).

 - Allow swap to be used a bit longer during system suspend and
   hibernation to avoid suspend failures under memory pressure (Mario
   Limonciello).

* pm-sleep:
  PM: sleep: docs: Replace "diasble" with "disable"
  PM: Restrict swap use to later in the suspend sequence
---

250d0579da5db2052cce2891a5eaa87450851354