blk-mq: Fix timeout handling in case the timeout handler returns BLK_EH_DONE

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3aa1f81922ff8c28a1f8ba12780a25fdae6eb0c2..2c7069037a15f1e855f50ea475a529df67617cfa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8446,7 +8446,6 @@ L:        linux-scsi@vger.kernel.org
 W:     http://www.avagotech.com/support/
 S:     Supported
 F:     drivers/message/fusion/
-F:     drivers/scsi/mpt2sas/
 F:     drivers/scsi/mpt3sas/
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
@@ -12134,6 +12133,18 @@ F:     include/dt-bindings/reset/
 F:     include/linux/reset.h
 F:     include/linux/reset-controller.h
 
+RESTARTABLE SEQUENCES SUPPORT
+M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     Boqun Feng <boqun.feng@gmail.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     kernel/rseq.c
+F:     include/uapi/linux/rseq.h
+F:     include/trace/events/rseq.h
+F:     tools/testing/selftests/rseq/
+
 RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org