Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2...

[mirror_ubuntu-jammy-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 845fc25812f1db0babadbb3355a4e156af7565ba..c588625c2250ac87a8468b3b80c0cf6849c14269 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6883,7 +6883,7 @@ M:        Jason Gunthorpe <jgg@mellanox.com>
 L:     linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org/
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
 S:     Supported
 F:     Documentation/devicetree/bindings/infiniband/
 F:     Documentation/infiniband/
@@ -11182,7 +11182,8 @@ S:      Maintained
 F:     drivers/firmware/qemu_fw_cfg.c
 
 QIB DRIVER
-M:     Mike Marciniszyn <infinipath@intel.com>
+M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/qib/
@@ -11209,7 +11210,6 @@ F:      include/linux/qed/
 F:     drivers/net/ethernet/qlogic/qede/
 
 QLOGIC QL4xxx RDMA DRIVER
-M:     Ram Amrani <Ram.Amrani@cavium.com>
 M:     Michal Kalderon <Michal.Kalderon@cavium.com>
 M:     Ariel Elior <Ariel.Elior@cavium.com>
 L:     linux-rdma@vger.kernel.org
@@ -11480,6 +11480,7 @@ 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>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/sw/rdmavt