jbd2: fix a kernel-doc markup

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b158ec4..8b82a02 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4256,7 +4256,6 @@ F:        drivers/net/ethernet/cisco/enic/
 CISCO VIC LOW LATENCY NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
 M:     Nelson Escobar <neescoba@cisco.com>
-M:     Parvi Kaustubhi <pkaustub@cisco.com>
 S:     Supported
 F:     drivers/infiniband/hw/usnic/
 
@@ -5232,7 +5231,6 @@ F:        kernel/dma/
 
 DMA-BUF HEAPS FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
-R:     Andrew F. Davis <afd@ti.com>
 R:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 R:     Liam Mark <lmark@codeaurora.org>
 R:     Laura Abbott <labbott@redhat.com>
@@ -6653,13 +6651,6 @@ L:       iommu@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/iommu/exynos-iommu.c
 
-EZchip NPS platform support
-M:     Vineet Gupta <vgupta@synopsys.com>
-M:     Ofer Levi <oferle@nvidia.com>
-S:     Supported
-F:     arch/arc/boot/dts/eznps.dts
-F:     arch/arc/plat-eznps
-
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
 M:     Chao Yu <yuchao0@huawei.com>
@@ -7239,7 +7230,7 @@ FUSE: FILESYSTEM IN USERSPACE
 M:     Miklos Szeredi <miklos@szeredi.hu>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-W:     http://fuse.sourceforge.net/
+W:     https://github.com/libfuse/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 F:     Documentation/filesystems/fuse.rst
 F:     fs/fuse/
@@ -7793,8 +7784,8 @@ F:        include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
 
 HFI1 DRIVER
-M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
-M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+M:     Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
+M:     Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/hfi1
@@ -9565,6 +9556,7 @@ F:        include/linux/sunrpc/
 F:     include/uapi/linux/nfsd/
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
+F:     Documentation/filesystems/nfs/
 
 KERNEL SELFTEST FRAMEWORK
 M:     Shuah Khan <shuah@kernel.org>
@@ -11168,6 +11160,12 @@ W:     http://www.melfas.com
 F:     Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
 F:     drivers/input/touchscreen/melfas_mip4.c
 
+MELLANOX BLUEFIELD I2C DRIVER
+M:     Khalil Blaiech <kblaiech@mellanox.com>
+L:     linux-i2c@vger.kernel.org
+S:     Supported
+F:     drivers/i2c/busses/i2c-mlxbf.c
+
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:     Tariq Toukan <tariqt@nvidia.com>
 L:     netdev@vger.kernel.org
@@ -11613,6 +11611,7 @@ M:      Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     linux-mips@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/mips/mscc.txt
+F:     Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
 F:     arch/mips/boot/dts/mscc/
 F:     arch/mips/configs/generic/board-ocelot.config
 F:     arch/mips/generic/board-ocelot.c
@@ -12339,6 +12338,7 @@ F:      include/linux/sunrpc/
 F:     include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
+F:     Documentation/filesystems/nfs/
 
 NILFS2 FILESYSTEM
 M:     Ryusuke Konishi <konishi.ryusuke@gmail.com>
@@ -12999,8 +12999,8 @@ S:      Maintained
 F:     drivers/char/hw_random/optee-rng.c
 
 OPA-VNIC DRIVER
-M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
-M:     Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
+M:     Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+M:     Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/ulp/opa_vnic
@@ -14301,8 +14301,8 @@ F:      drivers/firmware/qemu_fw_cfg.c
 F:     include/uapi/linux/qemu_fw_cfg.h
 
 QIB DRIVER
-M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
-M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
+M:     Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+M:     Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/qib/
@@ -14727,8 +14727,8 @@ S:      Maintained
 F:     drivers/net/ethernet/rdc/r6040.c
 
 RDMAVT - RDMA verbs software
-M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
-M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
+M:     Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+M:     Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/sw/rdmavt
@@ -17399,7 +17399,7 @@ S:      Maintained
 F:     drivers/thermal/ti-soc-thermal/
 
 TI BQ27XXX POWER SUPPLY DRIVER
-R:     Andrew F. Davis <afd@ti.com>
+R:     Dan Murphy <dmurphy@ti.com>
 F:     drivers/power/supply/bq27xxx_battery.c
 F:     drivers/power/supply/bq27xxx_battery_i2c.c
 F:     include/linux/power/bq27xxx_battery.h
@@ -17673,8 +17673,9 @@ S:      Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 F:     Documentation/RCU/torture.rst
 F:     kernel/locking/locktorture.c
-F:     kernel/rcu/rcuperf.c
+F:     kernel/rcu/rcuscale.c
 F:     kernel/rcu/rcutorture.c
+F:     kernel/rcu/refscale.c
 F:     kernel/torture.c
 
 TOSHIBA ACPI EXTRAS DRIVER