meta: update .mailmap and AUTHORS

Trott · juanarbol · commit 1e3e6895a6ef · 2022-04-04T18:53:49.000-05:00
Refs: #42599 (comment) PR-URL: #42602 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -356,6 +356,7 @@ Mitar Milutinovic <mitar.git@tnode.com>
 Mithun Sasidharan <mithunsasidharan89@gmail.com> <msasidharan@paypal.com>
 Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
 Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> <62040526+VoltrexMaster@users.noreply.github.com>
+MURAKAMI Masahiko <m-murakami@esm.co.jp> <fossamagna2@gmail.com>
 Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
 Myles Borins <myles.borins@gmail.com> <mylesborins@github.com>
 Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
@@ -538,6 +539,7 @@ Wyatt Preul <wpreul@gmail.com>
 Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
 xiaoyu <306766053@qq.com>
 Xu Meng <dmabupt@gmail.com> <mengxumx@cn.ibm.com>
+Xuguang Mei <meixuguang@gmail.com> <meixg@foxmail.com>
 Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
 Yang Guo <yangguo@chromium.org>
 Yash Ladha <yash@yashladha.in> <18033231+yashLadha@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -1183,7 +1183,7 @@ ikasumi_wt <wtsnyk13@gmail.com>
 Yoshiya Hinosawa <stibium121@gmail.com>
 Syuhei Kobayashi <nanocloudx@gmail.com>
 YutamaKotaro <california.dreamin.never.die@gmail.com>
-MURAKAMI Masahiko <fossamagna2@gmail.com>
+MURAKAMI Masahiko <m-murakami@esm.co.jp>
 Thomas Watson <w@tson.dk>
 Daijiro Yamada <yamad@daiji.ro>
 Kelvin Jin <kelvinjin@google.com>
@@ -3414,7 +3414,7 @@ Tony Gorez <gorez.tony@gmail.com>
 ofirbarak <ofirbirka@gmail.com>
 Bar Admoni <bar6020677@gmail.com>
 ofir <ofir@cs.huji.ac.il>
-Xuguang Mei <meixg@foxmail.com>
+Xuguang Mei <meixuguang@gmail.com>
 Elad Nava <eladnava@gmail.com>
 Balakrishna Avulapati <bavulapati@gmail.com>
 Aaron Xie <xieqiang9408@gmail.com>

-Original file line number
+Diff line change
 Mithun Sasidharan <[email protected]> <[email protected]>
 Mohammed Keyvanzadeh <[email protected]>
 Mohammed Keyvanzadeh <[email protected]> <[email protected]>
 +MURAKAMI Masahiko <[email protected]> <[email protected]>
 Myles Borins <[email protected]> <[email protected]>
 Myles Borins <[email protected]> <[email protected]>
 Myles Borins <[email protected]> <[email protected]>
 Xavier J Ortiz <[email protected]>
 xiaoyu <[email protected]>
 Xu Meng <[email protected]> <[email protected]>
 +Xuguang Mei <[email protected]> <[email protected]>
 Yael Hermon <[email protected]> <[email protected]>
 Yang Guo <[email protected]>
 Yash Ladha <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Yoshiya Hinosawa <[email protected]>
 Syuhei Kobayashi <[email protected]>
 YutamaKotaro <[email protected]>
 -MURAKAMI Masahiko <[email protected]>
 +MURAKAMI Masahiko <[email protected]>
 Thomas Watson <[email protected]>
 Daijiro Yamada <[email protected]>
 Kelvin Jin <[email protected]>
 ofirbarak <[email protected]>
 Bar Admoni <[email protected]>
 ofir <[email protected]>
 -Xuguang Mei <meixg@foxmail.com>
 +Xuguang Mei <meixuguang@gmail.com>
 Elad Nava <[email protected]>
 Balakrishna Avulapati <[email protected]>
 Aaron Xie <[email protected]>