doc: mailmap updates for mimic

Since the changeset is large, didn't create individual commits per author due to
the amount of possible rebase work

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

1 files changed, 89 insertions, 4 deletions

diff --git a/.mailmap b/.mailmap
index a015d2b2a41..f44a6da0b3d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
 Alexander Chuzhoy <achuzhoy@redhat.com> <schuzhoy@users.noreply.github.com>
 Alexandre Marangone <alexandre.marangone@inktank.com>
 Alexandre Marangone <alexandre.marangone@inktank.com> <a.marangone@gmail.com>
+Alexandre Marangone <amarango@redhat.com>
 Alexandre Oliva <oliva@gnu.org> <lxoliva@fsfla.org>
 Alexandre Oliva <oliva@gnu.org> <oliva@lsd.ic.unicamp.br>
 Alex Elder <elder@inktank.com> <elder@doink.(none)>
@@ -38,9 +39,13 @@ Anis Ayari <ayari_anis@live.fr>
 Aristoteles Neto <aristoteles.neto@webdrive.co.nz> <wdneto@users.noreply.github.com>
 Aron Gunn <ritz_303@yahoo.com>
 Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com>
+Ashita Kasam <694240887@qq.com>
 Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu> <baptiste@UbuntuBVM.lan>
 Barbora Ančincová <bara@redhat.com>
 Barbora Ančincová <bara@redhat.com> <bancinco@redhat.com>
+Benjeman Meekhof <bmeekhof@umich.edu> <bmeekhof@users.noreply.github.com>
+Bhavishya Gopesh <bhavishyagopesh@gmail.com>
+Bi Shun Ke <aionshun@livemail.tw>
 Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
 Bo Cai <cai.bo@h3c.com>
 Boris Ranto <branto@redhat.com>
@@ -48,13 +53,18 @@ 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>
+Byungsu Park <bspark8@sk.com>
 Jin Cai <caijin.caij@alibaba-inc.com>
 Caleb Miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> <caselim@gmail.com>
+Carl Xiong <cxiong@suse.com> <xiongc05@gmail.com>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
 Casey Bodley <cbodley@redhat.com>
 Casey Marshall <csm@soe.ucsc.edu> <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
 Ce Gu <guce@h3c.com>
+Ming Hao Cong <minghaocong@TENCENT64.site>
+Ming Hao Cong <minghaocong@TENCENT64.site> <chnmagnus@qq.com>
+Ming Hao Cong <minghaocong@TENCENT64.site> <root@TENCENT64.site>
 Chang Liu <liuchang0812@gmail.com> <nfcj000@qq.com>
 Chang Liu <liuchang0812@gmail.com>
 Chang-Yi Lee <cy.l@inwinstack.com>
@@ -92,6 +102,7 @@ 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>
+Deng Xiafubi <670318146@qq.com>
 Desmond Shih <desmond.s@inwinstack.com>
 Desmond Shih <desmond.s@inwinstack.com> <jordanjimmy41177@gmail.com>
 Dingdang Zhang <boqian.zy@alibaba-inc.com>
@@ -110,6 +121,7 @@ Eric Lee <eric.lee@hgst.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
+Ewaz Nazari <Nazari@keyinternational.academy>
 Fan Yang <yangf@neunn.com> <yfceph@gmail.com>
 Fangchen Sun <sunspot0105@gmail.com>
 Fang Yuxiang <fang.yuxiang@eisoo.com>
@@ -153,6 +165,7 @@ Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
 Guang Yang <yguang@yahoo-inc.com> <yguang@renownedground.corp.gq1.yahoo.com>
 Guang Yang <yguang@yahoo-inc.com> <yguang@yahoo-inc>
 Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
+Hans Bogert <hansbogert@gmail.com>
 Haodong Tang <haodong.tang@intel.com>
 Haomai Wang <haomai@xsky.com> <haomaiwang@gmail.com>
 Haomai Wang <haomai@xsky.com> <haomai@xsky.io>
@@ -170,13 +183,17 @@ Huang Jun <huangjun@xsky.com>
 Huang Jun <huangjun@xsky.com> <hjwsm1989@gmail.com>
 Ignacio Bravo <ibravo@hotmail.com>
 Igor Fedotov <ifedotov@suse.com>
+Igor Fedotov <ifedotov@suse.com> <linux@linux.suse>
+Igor Fedotov <ifedotov@suse.com> <ifed@mail.ru>
 Ilja Slepnev <islepnev@gmail.com>
 Ilya Shipitsin <chipitsine@gmail.com> <ilia@localhost.localdomain>
 Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
+Ilya Dryomov <idryomov@redhat.com>
 Ismael Serrano <ismael.serrano@gmail.com> <ismaels@qti.qualcomm.com>
 Jacek J. Łakis <jacek.lakis@intel.com>
 Jacek J. Łakis <jacek.lakis@intel.com> <jlakis@gklab-126-033.igk.intel.com>
 Jaemyoun Lee <jaemyoun@gmail.com>
+James Mcclune <jmcclune@mcclunetechnologies.net>
 James Page <james.page@ubuntu.com> <jamespage@ubuntu.com>
 Jason Dillaman <dillaman@redhat.com> <jdillaman@redhat.com>
 Jason Dillaman <dillaman@redhat.com> <jdillama@redhat.com>
@@ -195,8 +212,10 @@ Jenkins <jenkins@ceph.com> <jenkins-build@trusty-small-unique--68a2c286-dc75-466
 Jenkins <jenkins@ceph.com> <jenkins-build@trusty-small-unique--e64d6d03-305d-46bd-9a2c-9b546e06937e.localdomain>
 Jenkins <jenkins@ceph.com> Jenkins Build Slave User <jenkins-build@trusty-small-unique--a7f82f5f-8832-433e-a632-928924f47e04.localdomain>
 Jenkins <jenkins@ceph.com> Jenkins Build Slave User <ceph-release-team@redhat.com>
+Jeremy H Austin <jhaustin@gmail.com>
 Jesse Williamson <jesse.williamson@suse.com>
 Jesse Williamson <jesse.williamson@suse.com> <jwilliamson@suse.de>
+Jian Su <sujian@umcloud.com>
 Jiang Heng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com>
 Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
@@ -221,6 +240,7 @@ Joe Buck <jbbuck@gmail.com> <buck@vm-buck-ceph-bindings.(none)>
 John Spray <jspray@redhat.com>
 John Spray <jspray@redhat.com> <jcspray@gmail.com>
 John Spray <jspray@redhat.com> <john.spray@redhat.com>
+John Spray <jspray@redhat.com> <jcsp@redhat.com>
 Johnu George <johnugeo@cisco.com> <johnugeorge109@gmail.com>
 John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
 John Wilkins <john.wilkins@inktank.com> <john.wilkins@dreamhost.com>
@@ -236,13 +256,16 @@ Josh Durgin <jdurgin@redhat.com> <jduring@redhat.com>
 Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
 Junhui Tang <tangjunhui@sangfor.com.cn>
+Joshua Schmid <jschmid@suse.com> <jschmid@suse.de>
+Julien Collet <julien.collet@cern.ch>
+Justinas Lingys <jlingys@connect.ust.hk>
 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>
+Ken Dreyer <kdreyer@redhat.com> <ktdreyer@redhat.com>
 Kévin Caradant <kevin.caradant@gmail.com>
 Kiseleva Alyona <akiselyova@mirantis.com>
 Kongming Wu <wu.kongming@h3c.com>
@@ -250,10 +273,14 @@ Kuanlong Li <likuanlong@sangfor.com.cn>
 Lan De <lan.de3@zte.com.cn>
 Laszlo Boszormenyi <gcs@debian.hu>
 Leo Zhang <nguzcf@gmail.com>
+Lenz Grimmer <lgrimmer@suse.com> <lenz@grimmer.com>
+Liul <liul.stone@gmail.com>
 Luo Kexue <luo.kexue@zte.com.cn>
+Luo Muyao <luo.muyao@zte.com.cn>
 Luo Runbing <runsisi@hust.edu.cn>
 Luo Runbing <runsisi@zte.com.cn>
 Li Hongjie <lihongjie@cmss.chinamobile.com>
+Li Jing <lijing@gohighsec.com>
 Li Wang <li.wang@kylin-cloud.com> <liwang@ubuntukylin.com>
 Lin Bing <hawkerous@gmail.com>
 Linfei Hou <hou.linfei@h3c.com>
@@ -263,8 +290,10 @@ Liu Yuhong <liuyuhong@cmss.chinamobile.com>
 Liu Peiyan <liu.peiyang@h3c.com>
 Li Tianqing <tianqing@unitedstack.com>
 Lin Bing <hawkerous@gmail.com>
+Lin Xu Hua <linxuhua@unionpay.com>
 Liu Yang <yippeetry@gmail.com>
 Liuzhong Chen <liuzhong.chen@easystack.cn>
+Liyan Wang <liyan.wang@xtaotech.com>
 Yankun Li <liyankun@unitedstack.com>
 Yankun Li <liyankun@unitedstack.com> <lioveni99@gmail.com>
 Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com> <lluis@pamies.cat>
@@ -278,9 +307,11 @@ Luo Kexue <luo.kexue@zte.com.cn> scienceluo <luo.kexue@zte.com.cn>
 Luo Kexue <luo.kexue@zte.com.cn> <scienceluo@qq.com>
 Ma Jianpeng <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
+Mahati Chamarthy <mahati.chamarthy@intel.com> <mahati.chamarthy@gmail.com>
 Marcel Lauhoff <lauhoff@uni-mainz.de>
 Marcel Lauhoff <lauhoff@uni-mainz.de> <ml@irq0.org>
 Marco Garcês <marco.garces@bci.co.mz> <marco@garces.cc>
+Mark Kogan <mkogan@redhat.com>
 Mark Nelson <mnelson@redhat.com> <mark.a.nelson@gmail.com>
 Mark Nelson <mnelson@redhat.com> <nhm@clusterfaq.org>
 Matt Benjamin <matt@cohortfs.com> <matt@linuxbox.com>
@@ -299,9 +330,14 @@ Min Chen <chenmin@sangfor.com.cn>
 MingXin Liu <mingxin.liu@kylin-cloud.com> <mingxinliu@ubuntukylin.com>
 Mingqiao Wu <wumingqiao@inspur.com>
 Mingyue Zhao <zhao.mingyue@h3c.com>
+Mitch Birti <yahooguntu@gmail.com> <yahooguntu@users.noreply.github.com>
+Mohamad Gebai <mgebai@suse.com> <mohamad.gebai@gmail.com>
+My Do <mhdo@umich.edu>
+My Do <mhdo@umich.edu> <mhdo2@users.noreply.github.com>
 Mykola Golub <mgolub@mirantis.com> <mgolub@zhuzha.mirantis.lviv.net>
 Mykola Golub <to.my.trociny@gmail.com>
 Mykola Golub <mgolub@suse.com>
+Myna Vajha <mynaramana@gmail.com>
 Myoungwon Oh <omwmw@sk.com>
 Nathan Cutler <ncutler@suse.com>
 Nathan Cutler <ncutler@suse.com> <nculter@suse.com>
@@ -325,10 +361,13 @@ Pascal de Bruijn <pascal@unilogicnetworks.net>
 Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Patrick McGarry <patrick@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
+Patrick Nawracay <pnawracay@suse.com> <patrick@nawracay.de>
 Pan Liu <pan.liu@istuary.com> <liupan1111@gmail.com>
+Paul Emmerich <paul.emmerich@croit.io> <paul.emmerich@oocero.de>
 Pavan Rallabhandi <pavan.rallabhandi@sandisk.com> <pavanrallabhandis@gmail.com>
 Pavan Rallabhandi <PRallabhandi@walmartlabs.com> <root@ceph-node1.homeoffice.wal-mart.com>
 Peng Cheng Zhang <pengcheng.zhang@easystack.cn>
+Peng Cheng Zhang <pengcheng.zhang@easystack.cn> <pc@localhost.localdomain>
 Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
 Petertc Chu <petertc.chu@gmail.com>
 Pierre Chaumont <pierre.chaumont31@gmail.com>
@@ -336,6 +375,7 @@ Piotr Dałek <git@predictor.org.pl> <ceph@predictor.org.pl>
 Pritha Srivastava <prsrivas@redhat.com>
 Pritha Srivastava <prsrivas@redhat.com> <pritha@dhcp35-190.lab.eng.blr.redhat.com>
 Qiankun Zheng <zheng.qiankun@h3c.com>
+Quan Deng <dqdq1023@hotmail.com>
 Radoslaw Zarzynski <rzarzynski@mirantis.com> <rzarzynski@github.com>
 Radoslaw Zarzynski <rzarzynski@redhat.com> <rzarzyns@redhat.com>
 Rahul Aggarwal <rahul.1aggarwal@gmail.com>
@@ -346,6 +386,7 @@ Ren Huanwen <ren.huanwen@zte.com.cn>
 Ren Huanwen <ren.huanwen@zte.com.cn> <rhwlyw@163.com>
 Ren Huanwen <ren.huanwen@zte.com.cn> <sky@renhuanwentekiMacBook-Pro.local>
 Riccardo Ferretti <rferrett@soe.ucsc.edu> <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
+Richard Brown <RBrownCCB@opensuse.org>
 Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
 Robert Jansen <r.jansen@fairbanks.nl> <r.jansen86@gmail.com>
 Robert LeBlanc <robert.leblanc@endurance.com> <robert@leblancnet.us>
@@ -373,6 +414,7 @@ Sage Weil <sage@inktank.com> <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sage Weil <sage@inktank.com> <sage.weil@dreamhost.com>
 Sage Weil <sweil@redhat.com>
 Sage Weil <sweil@redhat.com> <sage@redhat.com>
+Sage Weil <sweil@redhat.com> <sage@redhat.com.>
 Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> <sahid.ferdjaoui@gmail.com>
 Sahithi R V <tansy.rv@gmail.com>
 Sahithi R V <tansy.rv@gmail.com> <sahithi.rv1@gmail.com>
@@ -392,18 +434,22 @@ Sangdi Xu <xu.sangdi@h3c.com>
 Sangdi Xu <xu.sangdi@h3c.com> <xu.sangdi@h3c>
 Scott A. Brandt <scott@cs.ucsc.edu> <sbrandt@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sebastian Wagner <swagner@suse.com> <sebastian.wagner@suse.com>
+Sebastien Chen <sebastien.chen92@gmail.com>
 Sébastien Han <shan@redhat.com> <sebastien.han@enovance.com>
 Sébastien Han <shan@redhat.com> <han.sebastien@gmail.com>
 Sébastien Han <shan@redhat.com> <seb@redhat.com>
 Sebastien Ponce <sebastien.ponce@cern.ch> <Sebastien.Ponce@cern.ch>
 Sebastien Ponce <sebastien.ponce@cern.ch> root <root@lxbre43a05.cern.ch>
+Sebastian Wagner <sebastian.wagner@suse.com> <swagner@suse.com>
 Sergey Arkhipov <nineseconds@yandex.ru>
 Shanggao Qiu <qiushanggao@qq.com>
 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>
+Shengjing Zhu <zhsj@umcloud.com> <i@zhsj.me>
+Shengjing Zhu <zhsj@umcloud.com> <zsj950618@gmail.com>
+Shen-Ta Hsieh <ibmibmibm.tw@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>
@@ -416,9 +462,11 @@ Shun Song <song.shun3@zte.com.cn> <songshun134@126.com>
 Shun Song <song.shun3@zte.com.cn> <root@clove83.zte.com.cn>
 Shylesh Kumar <shmohan@redhat.com> <shylesh.mohan@gmail.com>
 Sibei Gao <gaosb@inspur.com>
+Simran Singhal <singhalsimran0@gmail.com>
 Sirisha Guduru <SGuduru@walmartlabs.com>
 Song Baisen <song.baisen@zte.com.cn>
 Song Weibin <song.weibin@zte.com.cn>
+Stefan Knorr <sknorr@suse.com> <sknorr@suse.de>
 Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
 Subramanyam Varanasi <s.varanasi@ssi.samsung.com>
 Sushma Gurram <sushma.gurram@sandisk.com>
@@ -456,12 +504,18 @@ 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>
+Vasu Kulkarni <vasu@redhat.com>
+Vasu Kulkarni <vasu@redhat.com> <vasu.kulkarni@gmail.com>
+Vasu Kulkarni <vasu@redhat.com> <vakulkar@redhat.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>
+Wang Guoqin <wangguoqin1001@gmail.com>
+Wang Song Bo <wangsongbo@cloudin.cn>
+Wang Shu Guang <wangshugaung@inspur.com>
 Wang, Yaguang <yaguang.wang@intel.com>
+Wang Yong <wang.yong@datatom.com>
 Warren Usui <warren.usui@inktank.com>
 Warren Usui <wusui@redhat.com> <wusui@users.noreply.github.com>
 Warren Usui <wusui@redhat.com> <wusui@magna002.ceph.redhat.com>
@@ -473,8 +527,10 @@ Wei Jin <jinwei15@wanda.cn> <wjin.cn@gmail.com>
 Wei Luo <luowei@yahoo-inc.com>
 Wei Luo <weilluo@tencent.com>
 Wei Qian <weiq@dtdream.com>
+Wenfeng Wang <wang.wenfeng@h3c.com>
 Wenjun Huang <wenjunhuang@tencent.com>
 Wido den Hollander <wido@42on.com> <wido@widodh.nl>
+Wilson E. Alvarez <wilson.e.alvarez1@gmail.com>
 Wu Xingyi <wuxingyi@letv.com>
 Wu Mingqiao <wumingqiao@inspur.com>
 Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
@@ -482,6 +538,7 @@ Wu Jian <wujian3659@163.com>
 Xan Peng <xanpeng@gmail.com>
 Xavier Roche <roche+git@exalead.com> <roche@httrack.com>
 Xiangwei Wu <wuxiangwei@h3c.com>
+Xiang Xiang <xiangxiang@xsky.com>
 Xiaowei Chen <chen.xiaowei@h3c.com>
 Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xiaoyan Li <xiaoyan.li@intel.com>
@@ -490,7 +547,9 @@ Xie Rui <875016668@qq.com> <jerry.xr86@gmail.com>
 Xie Xingguo <xie.xingguo@zte.com.cn>
 Xie Xingguo <xie.xingguo@zte.com.cn> <258156334@qq.com>
 Xie Xingguo <xie.xingguo@zte.com.cn> <xie.xiexingguo@zte.com.cn>
-Xin Yuan <mychoxin@gmail.com>
+Xin Liao <liaoxinbit@gmail.com> <liaoxin01@baidu.com>
+Xin Yuan <xin.yuan@istuary.com>
+Xin Yuan <xin.yuan@istuary.com> <mychoxin@gmail.com>
 Xingyi Wu <wuxingyi2015@outlook.com>
 Xinxin Shu <shuxinxin@chinac.com>
 Xinze Chi <xinze@xsky.com>
@@ -498,6 +557,12 @@ Xinze Chi <xinze@xsky.com> <xmdxcxz@gmail.com>
 Xu Biao <xubiao.codeyz@gmail.com>
 Xuan Liu <liu.xuan@h3c.com>
 XueYu Bai <baixueyu@inspur.com>
+XueYu Bai <baixueyu@inspur.com> <root@localhost.localdomain>
+Yan Lei <yongyou.yl@alibaba-inc.com>
+Yan Lei <yongyou.yl@alibaba-inc.com> <yanlei_cv@aliyun.com>
+Yan Lei <yongyou.yl@alibaba-inc.com> <youngyou.yl@alibaba-inc.com>
+Yang DeLiu <yangdeliu@szsandstone.com>
+Yang DeLiu <yangdeliu@szsandstone.com> <455619311@qq.com>
 Yang Wang <yang.wang@easystack.cn>
 Yannick Atchy Dalama <yannick.atchy.dalama@gmail.com>
 Yankun Li <liyankun@unitedstack.com> <YankunLi@users.noreply.github.com>
@@ -505,6 +570,7 @@ 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>
+Yao Guotao <yaoguot@gmail.com> <yaoguotao@hualala.com>
 Yehua Chen <chen.yehua@h3c.com>
 Yehua Chen <chen.yehua@h3c.com> <root@ubuntu1.com>
 Yehuda Sadeh <yehuda@inktank.com> <yehdua@inktank.com>
@@ -523,10 +589,13 @@ Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@redhat.com.>
 Ye Tian <tianye@sangfor.com.cn>
 Yichao Li <liyichao.good@gmail.com>
 Ying He <heyingbj@inspur.com>
+Yixing Yan <yanyx@umcloud.com>
+Yuelong Guang <yuelongguang@gmail.com>
 Yongqiang He <he.yongqiang@h3c.com>
 Yongyue Sun <abioy.sun@gmail.com>
 You Ji <youji@ebay.com>
 Yunfei Guan <yunfei.guan@xtaotech.com>
+Yunfei Guan <yunfei.guan@xtaotech.com> <yunfeiguan@xtaotech.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
 Yunchuan Wen <yunchuan.wen@kylin-cloud.com> <yunchuanwen@ubuntukylin.com>
 Yuri Weinstein <yuriw@redhat.com> <yweinste@redhat.com>
@@ -537,18 +606,29 @@ 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>
+<<<<<<< HEAD
 XiaoCheng Wang <wangxiaocheng@sangfor.com.cn>
 Xiaofei Cui <cuixiaofei@sangfor.com.cn> <cuixiaofei@sangfor.com>
+=======
+Xie Xingguo <xie.xingguo@zte.com.cn> <xie.xingguo@gmail.com>
+Xuehan Xu <xuxuehan@360.cn> <xxhdx1985126@163.com>
+>>>>>>> a688393f8d... doc: mailmap updates for mimic
 Zack Cerza <zack@redhat.com> <zack.cerza@inktank.com>
 Zack Cerza <zack@redhat.com> <zack@cerza.org>
+Zack Cerza <zack@redhat.com> <zcerza@redhat.com>
 Zengran Zhang <zhangzengran@h3c.com>
+<<<<<<< HEAD
 Zengran Zhang <zhangzengran@sangfor.com.cn> <13121369189@126.com>
 Zhen Zeng <zengzhen@sangfor.com.cn>
+=======
+Zengran Zhang <zhangzengran@h3c.com> <13121369189@126.com>
+>>>>>>> a688393f8d... doc: mailmap updates for mimic
 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 Wen <zhangwen1@unionpay.com>
 Zhang Zezhu <zhang.zezhu@zte.com.cn>
 Zongyou Yao <yaozongyou@vip.qq.com>
 Gu Zhongyan <guzhongyan@ceph01v.ops.corp.qihoo.net>
@@ -556,11 +636,14 @@ Guo Zhandong <guozhandong@cmss.chinamobile.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <18896723979@139.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <idealguo@139.com>
 Zhao Chao <zhaochao1984@gmail.com>
+Zhao Yang Han <zhaoyang.han@easystack.cn>
 Zhao Kun <jswps2011@163.com>
+Zhao Kun <jswps2011@163.com> <develop@hikdata.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>
+Zheng Yin <zhengyin@huayun.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>
@@ -570,3 +653,5 @@ Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
 Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
 Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
 Zhuang Xiaochun <zhuangxc89@163.com>
+Ziye Yang <ziye.yang@intel.com> <optimistyzy@gmail.com>
+Zou Aiguo <zou.aiguo@zte.com.cn>