diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-04 22:54:55 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-04 22:54:55 +0300 |
| commit | 250d0579da5db2052cce2891a5eaa87450851354 (patch) | |
| tree | 8d1cfac42ce405cc758079666442a3b3684f9e48 /Documentation | |
| parent | 964209202ebe1569c858337441e87ef0f9d71416 (diff) | |
| parent | 3e7e5adcd2a86783c441edf6f518fc903e3c4e7c (diff) | |
| download | linux-250d0579da5db2052cce2891a5eaa87450851354.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-power | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 54195530e97a..d3da88b26a53 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power @@ -56,7 +56,7 @@ Date: January 2009 Contact: Rafael J. Wysocki <rjw@rjwysocki.net> Description: The /sys/devices/.../async attribute allows the user space to - enable or diasble the device's suspend and resume callbacks to + enable or disable the device's suspend and resume callbacks to be executed asynchronously (ie. in separate threads, in parallel with the main suspend/resume thread) during system-wide power transitions (eg. suspend to RAM, hibernation). |