diff --git a/.mailmap b/.mailmap
index d9fb83d67055c531f1be0cea47debfbd88f6dcf9..22831c2991ab54547c5733f82e9ef911475a295d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -341,3 +341,4 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
 Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
 Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
 Yusuke Goda <goda.yusuke@renesas.com>
+Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 2daa6ee673f7f272967a0c14ce34a4e19280d3a8..73e53207c920079793e26d58cf5ed54c85bcf138 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16195,7 +16195,7 @@ F:	drivers/infiniband/sw/siw/
 F:	include/uapi/rdma/siw-abi.h
 
 SOFT-ROCE DRIVER (rxe)
-M:	Zhu Yanjun <yanjunz@nvidia.com>
+M:	Zhu Yanjun <zyjzyj2000@gmail.com>
 L:	linux-rdma@vger.kernel.org
 S:	Supported
 F:	drivers/infiniband/sw/rxe/