The patch titled
Subject: block-remove-deadlock-in-disk_clear_events-fix
has been removed from the -mm tree. Its filename was
block-remove-deadlock-in-disk_clear_events-fix.patch
This patch was dropped because it was folded into block-remove-deadlock-in-disk_clear_events.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: block-remove-deadlock-in-disk_clear_events-fix
fix up comment
Cc: Derek Basehore <dbasehore@xxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Mandeep Singh Baines <msb@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
block/genhd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN block/genhd.c~block-remove-deadlock-in-disk_clear_events-fix block/genhd.c
--- a/block/genhd.c~block-remove-deadlock-in-disk_clear_events-fix
+++ a/block/genhd.c
@@ -1565,9 +1565,10 @@ unsigned int disk_clear_events(struct ge
/* uncondtionally schedule event check and wait for it to finish */
disk_block_events(disk);
- /* We need to put the work on system_nrt_wq here since there is a
+ /*
+ * We need to put the work on system_nrt_wq here since there is a
* deadlock that happens while probing a usb device while suspending. If
- * we put work on a freezable worqueue here, a usb probe will wait here
+ * we put work on a freezable workqueue here, a usb probe will wait here
* until the workqueue is unfrozen during suspend. Since suspend waits
* on all probes to complete, we have a deadlock
*/
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch
irq-tsk-comm-is-an-array.patch
block-remove-deadlock-in-disk_clear_events.patch
block-prevent-race-cleanup-fix.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
