Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[mirror_ubuntu-eoan-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a225661d623770b5df175c6242049fea58ec3bc9..ae4063ef5533a31a67186d829a8c6835941886e3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -745,6 +745,15 @@ S: Supported
 F:     Documentation/networking/device_drivers/amazon/ena.txt
 F:     drivers/net/ethernet/amazon/
 
+AMAZON RDMA EFA DRIVER
+M:     Gal Pressman <galpress@amazon.com>
+R:     Yossi Leybovich <sleybo@amazon.com>
+L:     linux-rdma@vger.kernel.org
+Q:     https://patchwork.kernel.org/project/linux-rdma/list/
+S:     Supported
+F:     drivers/infiniband/hw/efa/
+F:     include/uapi/rdma/efa-abi.h
+
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 M:     Gary Hook <gary.hook@amd.com>
@@ -4279,7 +4288,7 @@ S:        Supported
 F:     drivers/scsi/cxgbi/cxgb3i
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
-M:     Steve Wise <swise@chelsio.com>
+M:     Potnuri Bharat Teja <bharat@chelsio.com>
 L:     linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org
 S:     Supported
@@ -4308,7 +4317,7 @@ S:        Supported
 F:     drivers/scsi/cxgbi/cxgb4i
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
-M:     Steve Wise <swise@chelsio.com>
+M:     Potnuri Bharat Teja <bharat@chelsio.com>
 L:     linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org
 S:     Supported
@@ -7727,6 +7736,10 @@ F:       drivers/infiniband/
 F:     include/uapi/linux/if_infiniband.h
 F:     include/uapi/rdma/
 F:     include/rdma/
+F:     include/trace/events/ib_mad.h
+F:     include/trace/events/ib_umad.h
+F:     samples/bpf/ibumad_kern.c
+F:     samples/bpf/ibumad_user.c
 
 INGENIC JZ4780 DMA Driver
 M:     Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>