Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[platform/kernel/linux-rpi.git] / MAINTAINERS
index 266c2f4..1c42103 100644 (file)
@@ -736,6 +736,14 @@ S: Maintained
 F:     Documentation/i2c/busses/i2c-ali1563.rst
 F:     drivers/i2c/busses/i2c-ali1563.c
 
+ALIBABA ELASTIC RDMA DRIVER
+M:     Cheng Xu <chengyou@linux.alibaba.com>
+M:     Kai Shen <kaishen@linux.alibaba.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/hw/erdma
+F:     include/uapi/rdma/erdma-abi.h
+
 ALIENWARE WMI DRIVER
 L:     Dell.Client.Kernel@dell.com
 S:     Maintained