The patch titled PM: Fix swsusp debug mode testproc has been added to the -mm tree. Its filename is pm-fix-swsusp-debug-mode-testproc.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: PM: Fix swsusp debug mode testproc From: "Rafael J. Wysocki" <rjw@xxxxxxx> The 'testproc' swsusp debug mode thaws tasks twice in a row, which is _very_ confusing. Fix that. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Acked-by: Pavel Machek <pavel@xxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/power/disk.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/power/disk.c~pm-fix-swsusp-debug-mode-testproc kernel/power/disk.c --- a/kernel/power/disk.c~pm-fix-swsusp-debug-mode-testproc +++ a/kernel/power/disk.c @@ -153,7 +153,7 @@ int pm_suspend_disk(void) return error; if (pm_disk_mode == PM_DISK_TESTPROC) - goto Thaw; + return 0; suspend_console(); error = device_suspend(PMSG_FREEZE); _ Patches currently in -mm which might be from rjw@xxxxxxx are git-acpi.patch uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch swsusp-use-partition-device-and-offset-to-identify-swap-areas.patch swsusp-rearrange-swap-handling-code.patch swsusp-use-block-device-offsets-to-identify-swap-locations-rev-2.patch swsusp-add-resume_offset-command-line-parameter-rev-2.patch swsusp-document-support-for-swap-files-rev-2.patch swsusp-add-ioctl-for-swap-files-support.patch swsusp-update-userland-interface-documentation.patch swsusp-improve-handling-of-highmem.patch swsusp-improve-handling-of-highmem-fix.patch swsusp-use-__gfp_wait.patch swsusp-fix-platform-mode.patch add-include-linux-freezerh-and-move-definitions-from.patch add-include-linux-freezerh-and-move-definitions-from-ueagle-fix.patch quieten-freezer-if-config_pm_debug.patch swsusp-cleanup-whitespace-in-freezer-output.patch swsusp-thaw-userspace-and-kernel-space-separately.patch swsusp-support-i386-systems-with-pae-or-without-pse.patch suspend-dont-change-cpus_allowed-for-task-initiating-the-suspend.patch swsusp-measure-memory-shrinking-time.patch suspend-to-disk-fails-if-gdb-is-suspended-with-a-traced-child.patch convert-pm_sem-to-a-mutex.patch convert-pm_sem-to-a-mutex-fix.patch swsusp-untangle-thaw_processes.patch swsusp-untangle-freeze_processes.patch swsusp-fix-coding-style-in-suspendc.patch swsusp-fix-labels.patch pm-fix-swsusp-debug-mode-testproc.patch support-for-freezeable-workqueues.patch use-freezeable-workqueues-in-xfs.patch make-8250_pnp-serial-driver-work-after.patch make-8250_pnp-serial-driver-work-after-tidy.patch md-change-lifetime-rules-for-md-devices.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html