Merge tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bafc8043d4f0df1858f9220ebdab17e932bf4bbc..a4476dba6a0be29bda01a1ceb8d089ddb37ba8d1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3219,7 +3219,7 @@ M:        Johannes Weiner <hannes@cmpxchg.org>
 L:     cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroups/
+F:     Documentation/cgroup*
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
 
@@ -3230,7 +3230,7 @@ W:        http://www.bullopensource.org/cpuset/
 W:     http://oss.sgi.com/projects/cpusets/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroups/cpusets.txt
+F:     Documentation/cgroup-v1/cpusets.txt
 F:     include/linux/cpuset.h
 F:     kernel/cpuset.c
 
@@ -3494,6 +3494,7 @@ F:        Documentation/ABI/testing/sysfs-class-cxl
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
 M:     Manoj N. Kumar <manoj@linux.vnet.ibm.com>
 M:     Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
+M:     Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
@@ -5831,7 +5832,15 @@ M:       Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvscsi*
-F:     drivers/scsi/ibmvscsi/viosrp.h
+F:     include/scsi/viosrp.h
+
+IBM Power Virtual SCSI Device Target Driver
+M:     Bryant G. Ly <bryantly@linux.vnet.ibm.com>
+M:     Michael Cyr <mikecyr@linux.vnet.ibm.com>
+L:     linux-scsi@vger.kernel.org
+L:     target-devel@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/ibmvscsi_tgt/
 
 IBM Power Virtual FC Device Drivers
 M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
@@ -7639,6 +7648,15 @@ W:       http://www.mellanox.com
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
+SOFT-ROCE DRIVER (rxe)
+M:     Moni Shoua <monis@mellanox.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+W:     https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
+Q:     http://patchwork.kernel.org/project/linux-rdma/list/
+F:     drivers/infiniband/hw/rxe/
+F:     include/uapi/rdma/rdma_user_rxe.h
+
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
@@ -9811,10 +9829,14 @@ L:      rtc-linux@googlegroups.com
 Q:     http://patchwork.ozlabs.org/project/rtc-linux/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/rtc/
 F:     Documentation/rtc.txt
 F:     drivers/rtc/
 F:     include/linux/rtc.h
 F:     include/uapi/linux/rtc.h
+F:     include/linux/rtc/
+F:     include/linux/platform_data/rtc-*
+F:     tools/testing/selftests/timers/rtctest.c
 
 REALTEK AUDIO CODECS
 M:     Bard Liao <bardliao@realtek.com>