diff --git a/.topdeps b/.topdeps
new file mode 100644
index 0000000000..1f7391f92b
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master
diff --git a/.topmsg b/.topmsg
new file mode 100644
index 0000000000..32ac3c9a9a
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,6 @@
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Subject: [PATCH] fix taskq
+
+Don't ever sleep at interrupt time
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
diff --git a/zfs/lib/libzpool/zio.c b/zfs/lib/libzpool/zio.c
index d347920ea6..a20f971c90 100644
--- a/zfs/lib/libzpool/zio.c
+++ b/zfs/lib/libzpool/zio.c
@@ -901,7 +901,7 @@ zio_taskq_dispatch(zio_t *zio, enum zio_taskq_type q)
 		t = ZIO_TYPE_NULL;
 
 	(void) taskq_dispatch(zio->io_spa->spa_zio_taskq[t][q],
-	    (task_func_t *)zio_execute, zio, TQ_SLEEP);
+	    (task_func_t *)zio_execute, zio, TQ_NOSLEEP);
 }
 
 static boolean_t