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

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3b1d79b..b6ec336 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7579,7 +7579,8 @@ F:        Documentation/admin-guide/perf/hisi-pmu.rst
 
 HISILICON ROCE DRIVER
 M:     Lijun Ou <oulijun@huawei.com>
-M:     Wei Hu(Xavier) <xavier.huwei@huawei.com>
+M:     Wei Hu(Xavier) <huwei87@hisilicon.com>
+M:     Weihang Li <liweihang@huawei.com>
 L:     linux-rdma@vger.kernel.org
 S:     Maintained
 F:     drivers/infiniband/hw/hns/
@@ -15421,11 +15422,9 @@ F:     drivers/infiniband/sw/siw/
 F:     include/uapi/rdma/siw-abi.h
 
 SOFT-ROCE DRIVER (rxe)
-M:     Moni Shoua <monis@mellanox.com>
+M:     Zhu Yanjun <yanjunz@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/sw/rxe/
 F:     include/uapi/rdma/rdma_user_rxe.h