mailmap fixes for 12.2.0

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

1 files changed, 36 insertions, 4 deletions

diff --git a/.mailmap b/.mailmap
index ebda66e6df8..a015d2b2a41 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@ Aaron Bassett <abassett@gmail.com>
 Abhishek Lekshmanan <abhishek@suse.com> <alekshmanan@suse.com>
 Abhishek Lekshmanan <abhishek@suse.com> <abhishek.lekshmanan@gmail.com>
 Adam C. Emerson <aemerson@redhat.com>
+Adam Kupczyk <akupczyk@redhat.com>
+Adam Kupczyk <akupczyk@redhat.com> <akucpzyk@redhat.com>
 Adam Twardowski <adam.twardowski@gmail.com>
 Adir Lev <adirl@mellanox.com>
 Ahoussi Armand <ahoussi.say@telecom-bretagne.eu> <delco225>
@@ -25,6 +27,7 @@ Alex Elder <elder@inktank.com> <elder@dreamhost.com>
 Alex Elder <elder@inktank.com> <elder@speedy.(none)>
 Alexis Normand <n.al3xis@gmail.com> <smagtony>
 Alfredo Deza <adeza@redhat.com> <alfredo@deza.pe>
+Amit Kumar <amitkuma@redhat.com>
 Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc> <andreas.gerstmayr@gmail.com>
 Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
 Andrew Bartlett <abartlet@catalyst.net.nz> <abartlet@samba.org>
@@ -45,6 +48,7 @@ Brian Andrus <bandrus@redhat.com> <bandrus+github@gmail.com>
 Brian Felton <bjfelton@gmail.com>
 Brian Rak <dn@devicenull.org>
 Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
+Jin Cai <caijin.caij@alibaba-inc.com>
 Caleb Miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> <caselim@gmail.com>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
@@ -60,6 +64,9 @@ Chen Dihao <tobeg3oogle@gmail.com>
 Chendi Xue <chendi.xue@intel.com>
 Chendi Xue <chendi.xue@intel.com> <xuechendi@gmail.com>
 Cheng Cheng <ccheng.leo@gmail.com>
+Chen Hg <mesfet@126.com>
+Chen Hg <mesfet@126.com> <c744402859@gmail.com>
+Fangxian Chen <chenfangxian@cmss.chinamobile.com>
 Chu Hua-Rong <hrchu@cht.com.tw>
 Chu Hua-Rong <hrchu@cht.com.tw> <petertc@gmail.com>
 Chris Holcombe <chris.holcombe@nebula.com> <xfactor973@gmail.com>
@@ -81,17 +88,22 @@ Daniel Gryniewicz <dang@redhat.com> <dang@fprintf.net>
 Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
 Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
 Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
+Daniel Bar-On <danielbo@mellanox.com>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Dennis Schafroth <dennis@schafroth.com> <dennis@schafroth.dk>
 Desmond Shih <desmond.s@inwinstack.com>
 Desmond Shih <desmond.s@inwinstack.com> <jordanjimmy41177@gmail.com>
+Dingdang Zhang <boqian.zy@alibaba-inc.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dmitry Yatsushkevich <dyatsushkevich@mirantis.com> <dmitry.yatsushkevich@gmail.com>
 Dominik Hannen <cantares1+github@gmail.com> <dhxgit@users.noreply.github.com>
 Donghai Xu <xu.donghai@h3c.com>
 Dongmao Zhang <deanraccoon@gmail.com>
 Dongsheng Yang <dongsheng.yang@easystack.cn>
+Dongdong Tao <tdd21151186@gmail.com>
+Linpeng Dong <donglinpeng@cmss.chinamobile.com>
+Donglin Peng <donglinpeng@cmss.chinamobile.com> <root@dlp-dev01.novalocal>
 Edward Yang <eyang@us.fujitsu.com> <root@gluster5.gfs.fsw.fujitsu.com>
 Enming Zhang <enming.zhang@umcloud.com>
 Eric Lee <eric.lee@hgst.com>
@@ -154,7 +166,8 @@ Holger Macht <hmacht@suse.de> <holger@homac.de>
 Hongtong Liu <hongtong.liu@istuary.com>
 Hong Zhangoole <hong.zhangoole@gmail.com>
 Huamin Chen <hchen@redhat.com>
-Huang Jun <hjwsm1989@gmail.com>
+Huang Jun <huangjun@xsky.com>
+Huang Jun <huangjun@xsky.com> <hjwsm1989@gmail.com>
 Ignacio Bravo <ibravo@hotmail.com>
 Igor Fedotov <ifedotov@suse.com>
 Ilja Slepnev <islepnev@gmail.com>
@@ -188,6 +201,7 @@ Jiang Heng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com>
 Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
 Jianjian huo <jianjian.huo@ssi.samsung.com> <samuel.huo@gmail.com>
+Jiaying Ren <jiaying.ren@umcloud.com> <mikulely@gmail.com>
 Jingkai Yuan <jingkai.yuan@intel.com>
 Ji Chen <insomnia@139.com>
 Jie Li <li.jieA@h3c.com>
@@ -225,6 +239,7 @@ Junhui Tang <tangjunhui@sangfor.com.cn>
 Kacper Kowalik <xarthisius@gentoo.org>
 Kanika Murarka <kmurarka@redhat.com> <murarkakanika@gmail.com>
 Kapil Sharma <ksharma@suse.com>
+Karol Mroz <kmroz@suse.com> <kmroz@suse.de>
 Kefu Chai <kchai@redhat.com> <tchaikov@gmail.com>
 Kefu Chai <kchai@redhat.com> <kefu@redhat.com>
 Ken Dreyer <kdreyer@redhat.com>
@@ -239,13 +254,15 @@ Luo Kexue <luo.kexue@zte.com.cn>
 Luo Runbing <runsisi@hust.edu.cn>
 Luo Runbing <runsisi@zte.com.cn>
 Li Hongjie <lihongjie@cmss.chinamobile.com>
-Li Wang <laurence.liwang@gmail.com> <li.wang@kylin-cloud.com>
-Li Wang <laurence.liwang@gmail.com> <liwang@ubuntukylin.com>
+Li Wang <li.wang@kylin-cloud.com> <liwang@ubuntukylin.com>
+Lin Bing <hawkerous@gmail.com>
 Linfei Hou <hou.linfei@h3c.com>
 Liu Hong <liuhong@cmss.chinamobile.com>
 Liu Lei <liul124@chinaunicom.cn>
+Liu Yuhong <liuyuhong@cmss.chinamobile.com>
 Liu Peiyan <liu.peiyang@h3c.com>
 Li Tianqing <tianqing@unitedstack.com>
+Lin Bing <hawkerous@gmail.com>
 Liu Yang <yippeetry@gmail.com>
 Liuzhong Chen <liuzhong.chen@easystack.cn>
 Yankun Li <liyankun@unitedstack.com>
@@ -296,6 +313,8 @@ Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
 Nick Fisk <nick@fisk.me.uk>
 Nicolas Yong <nicolas.yong93@gmail.com>
 Ning Tao <ningtao@sangfor.com.cn> <63358@sangfor.com>
+Nick Erdmann <n@nirf.de>
+Nick Erdmann <n@nirf.de> <11783095+nrdmn@users.noreply.github.com>
 Ning Yao <yaoning@ruijie.com.cn> <zay11022@gmail.com>
 Ning Yao <yaoning@unitedstack.com>
 Noah Watkins <nwatkins@redhat.com> <jayhawk@cs.ucsc.edu>
@@ -309,7 +328,7 @@ Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 Pan Liu <pan.liu@istuary.com> <liupan1111@gmail.com>
 Pavan Rallabhandi <pavan.rallabhandi@sandisk.com> <pavanrallabhandis@gmail.com>
 Pavan Rallabhandi <PRallabhandi@walmartlabs.com> <root@ceph-node1.homeoffice.wal-mart.com>
-Pengcheng Zhang <pengcheng.zhang@easystack.cn>
+Peng Cheng Zhang <pengcheng.zhang@easystack.cn>
 Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
 Petertc Chu <petertc.chu@gmail.com>
 Pierre Chaumont <pierre.chaumont31@gmail.com>
@@ -318,8 +337,10 @@ Pritha Srivastava <prsrivas@redhat.com>
 Pritha Srivastava <prsrivas@redhat.com> <pritha@dhcp35-190.lab.eng.blr.redhat.com>
 Qiankun Zheng <zheng.qiankun@h3c.com>
 Radoslaw Zarzynski <rzarzynski@mirantis.com> <rzarzynski@github.com>
+Radoslaw Zarzynski <rzarzynski@redhat.com> <rzarzyns@redhat.com>
 Rahul Aggarwal <rahul.1aggarwal@gmail.com>
 Ramakrishnan Periyasamy <rperiyas@redhat.com> <ramakrishnan@dhcp35-178.lab.eng.blr.redhat.com>
+Redick Wang <redickwang@tencent.com>
 Rémi Buisson <remi.buisson@cdiscount.com>
 Ren Huanwen <ren.huanwen@zte.com.cn>
 Ren Huanwen <ren.huanwen@zte.com.cn> <rhwlyw@163.com>
@@ -382,6 +403,7 @@ Shotaro Kawaguchi <kawaguchi.s@jp.fujitsu.com>
 Shanchun Lv <lvshanchun@gmail.com>
 Shawn Chen <cxwshawn@gmail.com>
 Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca> <shehbazjaffer007@gmail.com>
+Shengjing Zhu <zsj950618@gmail.com>
 Shinobu Kinjo <shinobu@redhat.com> <shinobu@linux.com> 
 Shinobu Kinjo <shinobu@redhat.com> <ceph@ceph-stack.redhat.com>
 Shishir Gowda <shishir.gowda@sandisk.com>
@@ -433,7 +455,9 @@ Uday Mullangi <udaymjl@gmail.com> <umullan@L-IDCAA8G3QC-M.local>
 Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com>
 Varada Kari <varada.kari@sandisk.com>
 Varada Kari <varada.kari@sandisk.com> <kariraja@yahoo.com>
+Varada Kari <varada.kari@sandisk.com> <varada.kari@gmail.com>
 Vasu Kulkarni <vasu.kulkarni@gmail.com>
+Victor Araujo <ve.ar91@gmail.com> <templar996@gmail.com>
 Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
 Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
 Walter Huf <hufman@gmail.com>
@@ -452,12 +476,15 @@ Wei Qian <weiq@dtdream.com>
 Wenjun Huang <wenjunhuang@tencent.com>
 Wido den Hollander <wido@42on.com> <wido@widodh.nl>
 Wu Xingyi <wuxingyi@letv.com>
+Wu Mingqiao <wumingqiao@inspur.com>
 Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
+Wu Jian <wujian3659@163.com>
 Xan Peng <xanpeng@gmail.com>
 Xavier Roche <roche+git@exalead.com> <roche@httrack.com>
 Xiangwei Wu <wuxiangwei@h3c.com>
 Xiaowei Chen <chen.xiaowei@h3c.com>
 Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
+Xiaoyan Li <xiaoyan.li@intel.com>
 Xie Rui <875016668@qq.com>
 Xie Rui <875016668@qq.com> <jerry.xr86@gmail.com>
 Xie Xingguo <xie.xingguo@zte.com.cn>
@@ -476,6 +503,7 @@ Yannick Atchy Dalama <yannick.atchy.dalama@gmail.com>
 Yankun Li <liyankun@unitedstack.com> <YankunLi@users.noreply.github.com>
 Yan, Zheng <zheng.z.yan@intel.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
+Yan, Zheng <zyan@redhat.com>
 Yanchun Bai <yanchun.bai@istuary.com>
 Yehua Chen <chen.yehua@h3c.com>
 Yehua Chen <chen.yehua@h3c.com> <root@ubuntu1.com>
@@ -507,6 +535,7 @@ Yuri Weinstein <yuriw@redhat.com> <yuri.weinstein@gmail.com>
 Yuri Weinstein <yuriw@redhat.com> <yuriw@magna002.ceph.redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yweins@redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yuri.weinstein@redhat.com>
+Yuli Yang <yuliyang@cmss.chinamobile.com>
 Xianxia Xiao <xianxia.xiao@kylin-cloud.com>
 XiaoCheng Wang <wangxiaocheng@sangfor.com.cn>
 Xiaofei Cui <cuixiaofei@sangfor.com.cn> <cuixiaofei@sangfor.com>
@@ -519,8 +548,10 @@ Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
 Zhang Lei <zhanglei@trendytech.com.cn>
 Zhang Lei <zhanglei@trendytech.com.cn> <243290414@qq.com>
 Zhang Shaowen <zhang_shaowen@139.com>
+Zhang Weibing <zhangweibing@unitedstack.com>
 Zhang Zezhu <zhang.zezhu@zte.com.cn>
 Zongyou Yao <yaozongyou@vip.qq.com>
+Gu Zhongyan <guzhongyan@ceph01v.ops.corp.qihoo.net>
 Guo Zhandong <guozhandong@cmss.chinamobile.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <18896723979@139.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <idealguo@139.com>
@@ -529,6 +560,7 @@ Zhao Kun <jswps2011@163.com>
 Zhou Rui Song <236131368@qq.com>
 Zhou Rui Song <236131368@qq.com> <root@korea-fg-ceph-57-117.120.120.117>
 Zhenyu Leng <lengzhenyu@ict.ac.cn>
+Zheng Yin <zhengyin@chinac.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com>