Rollup merge of #86762 - JohnTitor:mailmap-for-work, r=Mark-Simulacrum

GuillaumeGomez · web-flow · commit 881b0fe91e28 · 2021-07-01T11:15:43.000+02:00
mailmap: Add my work email address

This de-duplicates the entry on the thanks.
diff --git a/.mailmap b/.mailmap
@@ -290,6 +290,7 @@ Xuefeng Wu <benewu@gmail.com> XuefengWu <benewu@gmail.com>
 York Xiang <bombless@126.com>
 Youngsoo Son <ysson83@gmail.com> <ysoo.son@samsung.com>
 Yuki Okushi <jtitor@2k36.org> <huyuumi.dev@gmail.com>
+Yuki Okushi <jtitor@2k36.org> <yuki.okushi@huawei.com>
 Zach Pomerantz <zmp@umich.edu>
 Zack Corr <zack@z0w0.me> <zackcorr95@gmail.com>
 Zack Slayton <zack.slayton@gmail.com>

-Original file line number
+Diff line change
 York Xiang <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Yuki Okushi <[email protected]> <[email protected]>
 +Yuki Okushi <[email protected]> <[email protected]>
 Zach Pomerantz <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>