mailmap: updates for nautilus

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

1 files changed, 107 insertions, 4 deletions

diff --git a/.organizationmap b/.organizationmap
index 87a7c4e4aa0..847b7ef75c3 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -48,7 +48,12 @@ Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>
 ARM <contact@arm.com> Tone Zhang <tone.zhang@arm.com>
 ArtiBit <contact@artibit.com> Rutger ter Borg <rutger@terborg.net>
+B1 Systems <contact@b1-systems.de> Michel <raabe@b1-systems.de>
 Bayan <contact@bayan.co.ir> Mohammad Salehe <salehe+dev@gmail.com>
+Baidu <contact@baidu.com> Liu Peng <liupeng37@baidu.com>
+Baidu <contact@baidu.com> Hao Wang <wanghao72@baidu.com>
+Baidu <contact@baidu.com> Song Shuangyang <songshuangyang@baidu.com>
+BBC <contact@bbc.co.uk> James P. Weaver <james.barrett@bbc.co.uk>
 BCI <contact@bci.co.mz> Marco Garcês <marco.garces@bci.co.mz>
 Beezim <contact@beezim.fr>  Florent Manens <florent@beezim.fr>
 Bigpoint.com <contact@bigpoint.net> Moritz Möller <mm@mxs.de>
@@ -81,11 +86,15 @@ China Mobile <contact@chinamobile.com> Jing Wenjun <jingwenjun@cmss.chinamobile.
 China Mobile <contact@chinamobile.com> Li Hongjie <lihongjie@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Liu Hong <liuhong@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Liu Yuhong <liuyuhong@cmss.chinamobile.com>
+China Mobile <contact@chinamobile.com> Li Kefei <likefei@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> lvshuhua <lvshuhua@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Xiubo Li <lixiubo@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Yuli Yang <yuliyang@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> wangzhengyong <wangzhengyong@cmss.chinamobile.com>
+China Mobile <contact@chinamobile.com> Yin Zheng <zhengyin@cmss.chinamobile.com>
+China Mobile <contact@chinamobile.com> Xiaoman Huang <huangxiaoman@cmss.chinamobile.com>
+China Mobile <contact@chinamobile.com> Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
 China Unicom <contact@chinaunicom.cn> Liu Lei <liul124@chinaunicom.cn>
 Chinac <info@chinac.com> Huan Zhang <zhanghuan@chinac.com>
 Chinac <info@chinac.com> Xinxin Shu <shuxinxin@chinac.com>
@@ -95,6 +104,7 @@ Chunghwa Telecom <contact@cht.com.tw> Chu Hua-Rong <hrchu@cht.com.tw>
 CISCO <contact@cisco.com> Johnu George <johnugeo@cisco.com>
 CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
 CISCO <contact@cisco.com> Roland Mechler <rmechler@cisco.com>
+CityNetwork <contact@citynetwork.eu> Florian Haas <florian@citynetwork.eu>
 Cloudin <contact@cloudin> Xinying Song <songxinying@cloudin.cn>
 Cloudin <contact@cloudin> Bingyin Zhang <zhangbingyin@cloudin.cn>
 Cloudin <contact@cloudin> Wang Song Bo <wangsongbo@cloudin.cn>
@@ -122,6 +132,7 @@ DiDi <contact@didichuxing.com> Xin Yuan <mychoxin@gmail.com>
 DiDi <contact@didichuxing.com> Yichao Li <liyichao.good@gmail.com>
 DiDi <contact@didichuxing.com> Li Wang <laurence.liwang@gmail.com>
 DigitalOcean <contact@digitalocean.com> Adam Wolfe Gordon <awg@digitalocean.com>
+DigitalOcean <contact@digitalocean.com> Robin H. Johnson <rjohnson@digitalocean.com>
 DigitalOcean <contact@digitalocean.com> Vaibhav Bhembre <vaibhav@digitalocean.com>
 Digiware <contact@digiware.nl> Willem Jan Withagen <wjw@digiware.nl>
 DreamHost <contact@dreamhost.com> Andrew Farmer <andrewf@hq.newdream.net>
@@ -143,6 +154,7 @@ DreamHost <contact@dreamhost.com> Stephon Striplin <stephon.striplin@dreamhost.c
 DreamHost <contact@dreamhost.com> Wesley Spikes <wesley.spikes@dreamhost.com>
 Dtdream <contact@dtdream.com> Li Peng <lip@dtdream.com>
 Dtdream <contact@dtdream.com> Wei Qian <weiq@dtdream.com>
+Dyncloud <contact@dyncloud.net> Tom Barron <tpb@dyncloud.net>
 Eayun <contact@eayun.com> Dunrong Huang <dunrong.huang@eayun.com>
 Eayun <contact@eayun.com> Liu Yang <yippeetry@gmail.com>
 Eayun <contact@eayun.com> Zhao Chao <zhaochao1984@gmail.com>
@@ -167,17 +179,22 @@ Easystack <contact@easystack.cn> Wanlong Gao <wanlong.gao@easystack.cn>
 Easystack <contact@easystack.cn> Yang Wang <yang.wang@easystack.cn>
 Easystack <contact@easystack.cn> Peng Cheng Zhang <pengcheng.zhang@easystack.cn>
 Easystack <contact@easystack.cn> Zhao Yang Han <zhaoyang.han@easystack.cn>
+Easystack <contact@easystack.cn> Xiaoguang Wang <xiaoguang.wang@easystack.cn>
 ESPOL <contact@espol.edu.ec> Edwin F. Boza <eboza@espol.edu.ec>
 Fairbanks <contact@fairbanks.nl> Robert Jansen <r.jansen@fairbanks.nl>
 FAU <contact@fau.de> Michael Eischer <michael.eischer@fau.de>
 Flipkart <contact@flipkart.com> Abhishek Varshney <abhishek.varshney@flipkart.com>
+Flipkart <contact@flipkart.com> Varada Kari <varadaraja.kari@flipkart.com>
 Free Software Foundation Europe <office@fsfeurope.org> Benoît Knecht <benoit.knecht@fsfe.org>
 Fujitsu <contact@fujitsu.com> Edward Yang <eyang@us.fujitsu.com>
+Fujitsu <contact@fujitsu.com> Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
 Fujitsu <contact@fujitsu.com> Igor Podoski <igor.podoski@ts.fujitsu.com>
+Fujitsu <contact@fujitsu.com> Mao Zhongyi <maozy.fnst@cn.fuitsu.com>
 Fujitsu <contact@fujitsu.com> Piotr Dałek <piotr.dalek@ts.fujitsu.com>
 Fujitsu <contact@fujitsu.com> Shotaro Kawaguchi <kawaguchi.s@jp.fujitsu.com>
 Fujitsu <contact@fujitsu.com> Takanori Nakao <nakao.takanori@jp.fujitsu.com>
 Fujitsu <contact@fujitsu.com> Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
+Fujitsu <contact@fujitsu.com> Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
 Gaikai <contact@gaikai.com> David Coles <dcoles@gaikai.com>
 GameServers.com <contact@gameservers.com> Brian Rak <dn@devicenull.org>
 Gentoo <contact@gentoo.org> Kacper Kowalik <xarthisius@gentoo.org>
@@ -245,6 +262,7 @@ HP <contact@hp.com> Blaine Gardner <blaine.gardner@hp.com>
 HP <contact@hp.com> Joe Handzik <joseph.t.handzik@hp.com>
 Huayun <contact@huayun.com> Zheng Yin <zhengyin@huayun.com>
 Huazhong University of Science and Technology <contact@hust.edu.cn> Luo Runbing <runsisi@hust.edu.cn>
+HXT Semiconductor <contact@hxt-semitech.org> Jiang Yutang <yutang2.jiang@hxt-semitech.com>
 IBM <contact@IBM.com> Andrew Solomon <asolomon@us.ibm.com>
 IBM <contact@IBM.com> Michel Normand <normand@linux.vnet.ibm.com>
 IBM <contact@IBM.com> Samuel Matzek <smatzek@us.ibm.com>
@@ -301,7 +319,7 @@ Inspur <contact@inspur.com> Sibei Gao <gaosb@inspur.com>
 Inspur <contact@inspur.com> XueYu Bai <baixueyu@inspur.com>
 Inspur <contact@inspur.com> Ying He <heyingbj@inspur.com>
 Inspur <contact@inspur.com> Wang Shu Guang <wangshugaung@inspur.com>
-Inspur <contact@inspur.com> Wuming Qiao <wumingqiao@inspur.com>
+Inspur <contact@inspur.com> Wu Mingqiao <wumingqiao@inspur.com>
 Intel <contact@intel.com> Anjaneya Chagam <anjaneya.chagam@intel.com>
 Intel <contact@intel.com> Chendi Xue <chendi.xue@intel.com>
 Intel <contact@intel.com> Chunmei Liu <chunmei.liu@intel.com>
@@ -316,6 +334,7 @@ Intel <contact@intel.com> Liu-Chunmei <chunmei.liu@intel.com>
 Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
 Intel <contact@intel.com> Mahati Chamarthy <mahati.chamarthy@intel.com>
 Intel <contact@intel.com> Orlando Moreno <orlando.moreno@intel.com>
+Intel <contact@intel.com> Qiaowei Ren <qiaowei.ren@intel.com>
 Intel <contact@intel.com> Tushar Gohad <tushar.gohad@intel.com>
 Intel <contact@intel.com> Shu, Xinxin <xinxin.shu@intel.com>
 Intel <contact@intel.com> Tushar Gohad <tushar.gohad@intel.com>
@@ -323,10 +342,11 @@ Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
 Intel <contact@intel.com> Xiaoyan Li <xiaoyan.li@intel.com>
 Intel <contact@intel.com> Xiaoxi Chen <xiaoxi.chen@intel.com>
 Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
-Intel <contact@intel.com> Yingxin <yingxin.cheng@intel.com>
+Intel <contact@intel.com> Yingxin Cheng <yingxin.cheng@intel.com>
 Intel <contact@intel.com> Yuan Zhou <yuan.zhou@intel.com>
 Intel <contact@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
 Intel <contact@intel.com> Ziye Yang <ziye.yang@intel.com>
+Intel <contact@intel.com> Liu Changcheng <changcheng.liu@intel.com>
 inwinSTACK inc. <leo.l@inwinstack.com> Chang-Yi Lee <cy.l@inwinstack.com>
 inwinSTACK inc. <leo.l@inwinstack.com> Albert Tu <albert.t@inwinstack.com>
 inwinSTACK inc. <leo.l@inwinstack.com> MinSheng Lin <minsheng.l@inwinstack.com>
@@ -354,6 +374,7 @@ Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.co
 LETV <contact@letv.com> Dongmao Zhang <deanraccoon@gmail.com>
 LETV <contact@letv.com> Ji Chen <insomnia@139.com>
 LETV <contact@letv.com> Wu Xingyi <wuxingyi@letv.com>
+Lenovo <contact@lenovo.com> Dan Guo <guodan1@lenovo.com>
 Linaro <contact@linaro.org> Steve Capper <steve.capper@linaro.org>
 Linaro <contact@linaro.org> wei xiao <wei.xiao@linaro.org>
 Linaro <contact@linaro.org> Tone Zhang <tone.zhang@linaro.org>
@@ -361,6 +382,8 @@ Linaro <contact@linaro.org> Yazen Ghannam <yazen.ghannam@linaro.org>
 Linaro <contact@linaro.org> Yibo Cai <yibo.cai@linaro.org>
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
 Locator Technologies <contact@locatortechnologies.com> Kris Jurka <kjurka@locatortechnologies.com>
+Naver <contact@navercorp.com> Junyoung, Sung <junyoung.sung@navercorp.com>
+Naver <contact@navercorp.com> Hyun-ha <hyun.ha@navercorp.com>
 Nefos b.v. <info@nefos.nl> Willem Jan Withagen <wjw@nefos.nl>
 McClune Technologies <contact@mcclunetechnologies.net> James Mcclune <jmcclune@mcclunetechnologies.net>
 Mellanox <contact@mellanox.com> Adir Lev <adirl@mellanox.com>
@@ -406,8 +429,10 @@ Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Er
 Pacific Northwest National Laboratory <contact@pnl.gov> Evan Felix <evan.felix@pnnl.gov>
 Pacific Northwest National Laboratory <contact@pnl.gov> Scott Devoid <devoid@anl.gov>
 Piston Cloud Computing <info@pistoncloud.com> Mike Lundy <mike@fluffypenguin.org>
+Platform.sh <contact@platform.sh> Simon Ruggier <simon@platform.sh>
 Pogoapp <contact@pogoapp.com> Paul Meserve <paul@pogodan.com>
 Profihost <contact@profihost.ag> Stefan Priebe <s.priebe@profihost.ag>
+ProphetStor <contact@prphetstor.com> Rick Chen <rick.chen@prophetstor.com>
 Proxmox Server Solutions GmbH <office@proxmox.com> Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Purdue University <contact@purdue.edu> Mike Shuey <shuey@purdue.edu>
 Qarnot <conatct@qarnot.com> Clément Pellegrini <clement.pellegrini@qarnot-computing.com>
@@ -415,6 +440,9 @@ Qnap <contact@qnap.com> Tim Lin <timlin@qnap.com>
 Quadrature Capital Limited <info@quadraturecapital.com> Jim Wright <jim@quadraturecapital.com>
 Quantum Corporation <info@quantum.com> Bassam Tabbara <bassam.tabbara@quantum.com>
 Raidix International <contact@raidix.com> Marov Aleksey <Marov.A@raidix.com>
+Red Hat <contact@redhat.com> Ben England <bengland@redhat.com>
+Red Hat <contact@redhat.com> Yaniv Kaul <ykaul@redhat.com>
+Red Hat <contact@redhat.com> Kaleb S. Keithley <kkeithle@redhat.com>
 Red Hat <contact@redhat.com> Adam C. Emerson <aemerson@redhat.com>
 Red Hat <contact@redhat.com> Adam Kupczyk <akupczyk@redhat.com>
 Red Hat <contact@redhat.com> Ademar de Souza Reis Jr <areis@redhat.com>
@@ -433,6 +461,7 @@ Red Hat <contact@redhat.com> Brad Hubbard <bhubbard@redhat.com>
 Red Hat <contact@redhat.com> Brett Niver <bniver@redhat.com>
 Red Hat <contact@redhat.com> Brian Andrus <bandrus@redhat.com>
 Red Hat <contact@redhat.com> Casey Bodley <cbodley@redhat.com>
+Red Hat <contact@redhat.com> Cleber Rosa <crosa@redhat.com>
 Red Hat <contact@redhat.com> Colin Walters <walters@redhat.com>
 Red Hat <contact@redhat.com> Daniel Gryniewicz <dang@redhat.com>
 Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
@@ -465,10 +494,12 @@ Red Hat <contact@redhat.com> John Spray <jspray@redhat.com>
 Red Hat <contact@redhat.com> John Wilkins <jwilkins@redhat.com>
 Red Hat <contact@redhat.com> Jos Collin <jcollin@redhat.com>
 Red Hat <contact@redhat.com> Josh Durgin <jdurgin@redhat.com>
+Red Hat <contact@redhat.com> Juan Miguel Olmo Martínez <jolmomar@redhat.com>
 Red Hat <contact@redhat.com> JuanJose 'JJ' Galvez <jgalvez@redhat.com>
 Red Hat <contact@redhat.com> Kanika Murarka <kmurarka@redhat.com>
 Red Hat <contact@redhat.com> Kefu Chai <kchai@redhat.com>
 Red Hat <contact@redhat.com> Ken Dreyer <kdreyer@redhat.com>
+Red Hat <contact@redhat.com> Karun Josy <kjosy@redhat.com>
 Red Hat <contact@redhat.com> Loic Dachary <ldachary@redhat.com>
 Red Hat <contact@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Red Hat <contact@redhat.com> Luis Pabón <lpabon@redhat.com>
@@ -503,6 +534,7 @@ Red Hat <contact@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.co
 Red Hat <contact@redhat.com> Sam Lang <slang@redhat.com>
 Red Hat <contact@redhat.com> Samuel Just <sjust@redhat.com>
 Red Hat <contact@redhat.com> Sandon Van Ness <svanness@redhat.com>
+Red Hat <contact@redhat.com> Scoots Hamilton <scoots@redhat.com>
 Red Hat <contact@redhat.com> Sébastien Han <shan@redhat.com>
 Red Hat <contact@redhat.com> Shilpa Jagannath <smanjara@redhat.com>
 Red Hat <contact@redhat.com> Shinobu Kinjo <shinobu@redhat.com>
@@ -514,6 +546,7 @@ Red Hat <contact@redhat.com> Tamil Muthamizhan <tmuthami@redhat.com>
 Red Hat <contact@redhat.com> Thomas Serlin <tserlin@redhat.com>
 Red Hat <contact@redhat.com> Tom Callaway <spot@redhat.com>
 Red Hat <contact@redhat.com> Travis Rhoden <trhoden@redhat.com>
+Red Hat <contact@redhat.com> Travis Nielsen <tnielsen@redhat.com>
 Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
 Red Hat <contact@redhat.com> Vasu Kulkarni <vasu@redhat.com>
 Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
@@ -521,11 +554,13 @@ Red Hat <contact@redhat.com> Vikhyat Umrao <vumrao@redhat.com>
 Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
 Red Hat <contact@redhat.com> Yan, Zheng <zyan@redhat.com>
 Red Hat <contact@redhat.com> Yehuda Sadeh <ysadehwe@redhat.com>
+Red Hat <contact@redhat.com> Yuval Lifshitz <ylifshit@redhat.com>
 Red Hat <contact@redhat.com> Yuri Weinstein <yuriw@redhat.com>
 Red Hat <contact@redhat.com> Zack Cerza <zack@redhat.com>
 Reliance Jio Infocomm Ltd. <contact@ril.com> Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
 Reliance Jio Infocomm Ltd. <contact@ril.com> Ashish Chandra <ashish.a.chandra@ril.com>
 Reliance Jio Infocomm Ltd. <contact@ril.com> Swami Reddy <swami.reddy@ril.com>
+RWTH Aachen University <conctact@rwth-aachen.de> Nick Erdmann <n.erdmann@itc.rwth-aachen.de>
 Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roaldvanloon.nl>
 Ruijie Networks <contact@ruijie.com.cn> Ning Yao <yaoning@ruijie.com.cn>
 Salesforce <contact@salesforce.com> Sameer Tiwari <stiwari@salesforce.com>
@@ -547,6 +582,7 @@ SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
 SanDisk <contact@sandisk.com> Tomy Cheru <tomy.cheru@sandisk.com>
 SanDisk <contact@sandisk.com> Varada Kari <varada.kari@sandisk.com>
 SanDisk <contact@sandisk.com> Vishal Kanaujia <Vishal.Kanaujia@sandisk.com>
+Sanger Institute <contact@sanger.ac.uk> Matthew Vernon <mv3@sanger.ac.uk>
 Sangfor <contact-sds@sangfor.com.cn> Xiaocheng Wang <wangxiaocheng@sangfor.com.cn>
 Sangfor <contact-sds@sangfor.com.cn> Tao Ning <ningtao@sangfor.com.cn>
 Sangfor <contact-sds@sangfor.com.cn> Xiaofei Cui <cuixiaofei@sangfor.com.cn>
@@ -559,16 +595,20 @@ Sangfor <contact-sds@sangfor.com.cn> Fang Yuxiang <fangyuxiang@sangfor.com.cn>
 Sangfor <contact-sds@sangfor.com.cn> Min Chen <chenmin@sangfor.com.cn>
 Sangfor <contact-sds@sangfor.com.cn> Jinling Zhao <zhaojinling@sangfor.com.cn>
 Sangfor <contact-sds@sangfor.com.cn> Junhui Tang <tangjunhui@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Zengran Zhang <zhzr@sangfor.com>
+Sangfor <contact-sds@sangfor.com.cn> Tang Junhui <tangjunhui@sangfor.com>
 Sandstone <contact@szsandstone.com> Yang DeLiu <yangdeliu@szsandstone.com>
 SAP <contact@sap.com> Marc Koderer <marc@koderer.com>
 Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
 SendFaster <contact@sendfaster.com> Christopher O'Connell <jwriteclub@gmail.com>
+SenseTime <contact@sensetime.com> Xinying Song <songxinying@sensetime.com>
 SK Telecom <rnd@sktelecom.com> Byungsu Park <bspark8@sk.com>
 SK Telecom <rnd@sktelecom.com> Ilsoo Byun <ilsoo.byun@sk.com>
 SK Telecom <rnd@sktelecom.com> Myoungwon Oh <omwmw@sk.com>
 SK Telecom <rnd@sktelecom.com> Taewoong Kim <taewoong.kim@sk.com>
 Sociomantic Labs <info@sociomantic.com> Iain Buclaw <iain.buclaw@sociomantic.com>
 Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
+StackHPC <contact@stackhpc> Stig Telfer <stig@stackhpc.com>
 SUSE <contact@suse.com> Abhishek Lekshmanan <abhishek@suse.com>
 SUSE <contact@suse.com> Adam Spiers <aspiers@suse.com>
 SUSE <contact@suse.com> Alexander Graf <agraf@suse.de>
@@ -578,6 +618,7 @@ SUSE <contact@suse.com> Daniel Oliveira <doliveira@suse.com>
 SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
 SUSE <contact@suse.com> Dirk Mueller <dmueller@suse.com>
 SUSE <contact@suse.com> Fabian Vogt <fvogt@suse.com>
+SUSE <contact@suse.com> Franck Bui <fbui@suse.com>
 SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
 SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
 SUSE <contact@suse.com> Igor Fedotov <ifedotov@suse.com>
@@ -589,6 +630,7 @@ SUSE <contact@suse.com> Kai Wagner <kwagner@suse.com>
 SUSE <contact@suse.com> Karl Eichwalder <ke@suse.de>
 SUSE <contact@suse.com> Karol Mroz <kmroz@suse.com>
 SUSE <contact@suse.com> Kapil Sharma <ksharma@suse.com>
+SUSE <contact@suse.com> Kyr Shatskyy <kyrylo.shatskyy@suse.com>
 SUSE <contact@suse.com> Laura Paduano <lpaduano@suse.com>
 SUSE <contact@suse.com> Lenz Grimmer <lgrimmer@suse.com>
 SUSE <contact@suse.com> Luis Henriques <lhenriques@suse.com>
@@ -604,10 +646,10 @@ SUSE <contact@suse.com> Sebastian Krah <skrah@suse.com>
 SUSE <contact@suse.com> Sebastian Wagner <swagner@suse.com>
 SUSE <contact@suse.com> Stephan Müller <smueller@suse.com>
 SUSE <contact@suse.com> Sebastian Wagner <sebastian.wagner@suse.com>
+SUSE <contact@suse.com> Shyukri Shyukriev <shshyukriev@suse.com>
 SUSE <contact@suse.com> Stefan Knorr <sknorr@suse.com>
 SUSE <contact@suse.com> Stephan Müller <smueller@suse.com>
 SUSE <contact@suse.com> Supriti Singh <supriti.singh@suse.com>
->>>>>>> a688393f8d... doc: mailmap updates for mimic
 SUSE <contact@suse.com> Sven Seeberg <sseebergelverfeldt@suse.com>
 SUSE <contact@suse.com> Tatjana Dehler <tdehler@suse.com>
 SUSE <contact@suse.com> Thorsten Behrens <tbehrens@suse.com>
@@ -618,6 +660,7 @@ SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch
 SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
 Synesis <contact@synesis.ru> Aleksei Gutikov <aleksey.gutikov@synesis.ru>
 T2Cloud <contact@t2cloud.net> Leo Zhang <nguzcf@gmail.com>
+T2Cloud <contact@t2cloud.net> Wang Hongxu <wanghongxu@t2cloud.net>
 TCloud Computing <contact@tcloudcomputing.com> CC Lien <cc_lien@tcloudcomputing.com>
 TCloud Computing <contact@tcloudcomputing.com> Henry C Chang <henry_c_chang@tcloudcomputing.com>
 TCloud Computing <contact@tcloudcomputing.com> Herb Shiu <herb_shiu@tcloudcomputing.com>
@@ -630,6 +673,8 @@ Tencent <contact@tencent.com> Redick Wang <redickwang@tencent.com>
 Tencent <contact@tencent.com> Wei Luo <weilluo@tencent.com>
 Tencent <contact@tencent.com> Wenjun Huang <wenjunhuang@tencent.com>
 Tencent <contact@tencent.com> Zhi Zhang <willzzhang@tencent.com>
+Tencent <contact@tencent.com> Jeegn Chen <jeegnchen@tencent.com>
+Tenctent <contcat@tencent.com> Ming Hao Cong <minghaocong@tencent.com>
 Tencent Cloud <contact@cloud.tencent.com> Chang Liu <liuchang0812@gmail.com>
 Tencent Cloud <contact@cloud.tencent.com> Jing Chen <jeegnchen@gmail.com>
 Tencent Cloud <contact@cloud.tencent.com> Shanchun Lv <lvshanchun@gmail.com>
@@ -650,11 +695,39 @@ UMCloud <contact@umcloud.com> Jian Su <sujian@umcloud.com>
 UMCloud <contact@umcloud.com> Jiaying Ren <jiaying.ren@umcloud.com>
 UMCloud <contact@umcloud.com> Rongze Zhu <zrzhit@gmail.com>
 UMCloud <contact@umcloud.com> Enming Zhang <enming.zhang@umcloud.com>
+UMCloud <contact@umcloud.com> Lan Liu <liulan@umcloud.com>
 UMCloud <contact@umcloud.com> Shengjing Zhu <zhsj@umcloud.com>
 UMCloud <contact@umcloud.com> Tao Chen <chentao@umcloud.com>
 UMCloud <contact@umcloud.com> Yixing Yan <yanyx@umcloud.com>
 UMCloud <contact@umcloud.com> Yang Honggang <yanghonggang@umcloud.com>
+Unaffiliated <no@organization.net> Massimiliano Cuttini <maxcuttins@users.noreply.github.com>
+Unaffiliated <no@organization.net> Diksha Godbole <diksha.godbole@gmail.com>
+Unaffiliated <no@organization.net> Gaurav Sitlani <gauravsitlani@riseup.net>
+Unaffiliated <no@organization.net> Valentin Lorentz <progval+git@progval.net>
+Unaffiliated <no@organization.net> ludehp <ludehp@163.com>
+Unaffiliated <no@organization.net> Peng Lai <penglaiyxy@gmail.com>
+Unaffiliated <no@organization.net> Chen Yu Peng <chenyupeng-it@360.cn>
+Unaffiliated <no@organization.net> Zhanhao (Jasper) Liu <jasperlau95@gmail.com>
+Unaffiliated <no@organization.net> Tatsuya Naganawa <tnaganawa@users.noreply.github.com>
+Unaffiliated <no@organization.net> David Wahler <dwahler@gmail.com>
+Unaffiliated <no@organization.net> mooncake <xcoder@tenxcloud.com>
+Unaffiliated <no@organization.net> Konstantin Sakhinov <sakhinov@gmail.com>
+Unaffiliated <no@organization.net> Tomasz Setkowski <tom@ai-traders.com>
+Unaffiliated <no@organization.net> Enming Zhang <zvampirem77@gmail.com>
+Unaffiliated <no@organization.net> Chengguang Xu <cgxu519@gmx.com>
+Unaffiliated <no@organization.net> Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
+Unaffiliated <no@organization.net> Liu Yang kuan <liuyangkuan@gmail.com>
+Unaffiliated <no@organization.net> Jerry Lee <leisurelysw24@gmail.com>
+Unaffiliated <no@organization.net> Dai Dang Van <daikk115@gmail.com>
+Unaffiliated <no@organization.net> Tomáš Kukrál <tom@6shore.net>
+Unaffiliated <no@organization.net> Remy Zandwijk <remy@luckyhands.nl>
+Unaffiliated <no@organization.net> Jonas Jelten <jj@stusta.net>
+Unaffiliated <no@organization.net> Brad Fitzpatrick <brad@danga.com>
+Unaffiliated <no@organization.net> Anthony D Atri <anthonyeleven@users.noreply.github.com>
+Unaffiliated <no@organization.net> Alexey Shabalin <shaba@altlinux.org>
+Unaffiliated <no@organization.net> Alexandru Cucu <alex.cucu@emag.ro>
 Unaffiliated <no@organization.net> Aaron Bassett <abassett@gmail.com>
+Unaffiliated <no@organization.net> Arthur Liu <arthurhsliu@users.noreply.github.com>
 Unaffiliated <no@organization.net> Abhishek Dixit <dixitabhi@gmail.com>
 Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
 Unaffiliated <no@organization.net> Adam Twardowski <adam.twardowski@gmail.com>
@@ -669,10 +742,12 @@ Unaffiliated <no@organization.net> Andy Allan <andy@gravitystorm.co.uk>
 Unaffiliated <no@organization.net> Anirudha Bose <ani07nov@gmail.com>
 Unaffiliated <no@organization.net> Anis Ayari <ayari_anis@live.fr>
 Unaffiliated <no@organization.net> Anthony Alba <ascanio.alba7@gmail.com>
+Unaffiliated <no@organization.net> Anton Oks <anton.oks@gmx.de>
 Unaffiliated <no@organization.net> Armando Segnini <armaseg@gmail.com>
 Unaffiliated <no@organization.net> Aron Gunn <ritz_303@yahoo.com>
 Unaffiliated <no@organization.net> Arthur Gorjux <arthurgorjux@gmail.com>
 Unaffiliated <no@organization.net> Ashita Dashottar <AshitaDashottar6@gmail.com>
+Unaffiliated <no@organization.net> Ashutosh Narkar <anarkar4387@gmail.com>
 Unaffiliated <no@organization.net> Ashita Kasam <694240887@qq.com>
 Unaffiliated <no@organization.net> Bhavishya Gopesh <bhavishyagopesh@gmail.com>
 Unaffiliated <no@organization.net> Bi Shun Ke <aionshun@livemail.tw>
@@ -697,6 +772,7 @@ Unaffiliated <no@organization.net> Daniel Schepler <dschepler@gmail.com>
 Unaffiliated <no@organization.net> Daniel Glaser <the78mole@chaintronics.com>
 Unaffiliated <no@organization.net> Darrell Enns <darrell@darrellenns.com>
 Unaffiliated <no@organization.net> David Anderson <dave@natulte.net>
+Unaffiliated <no@organization.net> David Wang <planetbeing@gmail.com>
 Unaffiliated <no@organization.net> Dennis Schafroth <dennis@schafroth.com>
 Unaffiliated <no@organization.net> Quan Deng <dqdq1023@hotmail.com>
 Unaffiliated <no@organization.net> Ding Dinghua <dingdinghua85@gmail.com>
@@ -801,9 +877,11 @@ Unaffiliated <no@organization.net> Lucas Fantinel <lucas.fantinel@gmail.com>
 Unaffiliated <no@organization.net> Коренберг Марк <socketpair@gmail.com>
 Unaffiliated <no@organization.net> Malcolm Lee <fengxueyu35@126.com>
 Unaffiliated <no@organization.net> Marc Schoechlin <ms@256bit.org>
+Unaffiliated <no@organization.net> Marcos Paulo de Souza <marcos.souza.org@gmail.com>
 Unaffiliated <no@organization.net> Matt Boyle <matt.boyle@gmail.com>
 Unaffiliated <no@organization.net> Matt Richards <mattjrichards@gmail.com>
 Unaffiliated <no@organization.net> Mauricio Garavaglia <mauriciogaravaglia@gmail.com>
+Unaffiliated <no@organization.net> Maxime Guyot <maxime@root314.com>
 Unaffiliated <no@organization.net> Maxime Robert <maxime.robert1992@gmail.com>
 Unaffiliated <no@organization.net> Mehdi Abaakouk <sileht@sileht.net>
 Unaffiliated <no@organization.net> Michael Nelson <mikenel@tnld.net>
@@ -815,7 +893,9 @@ Unaffiliated <no@organization.net> Ming Hao Cong <minghaocong@TENCENT64.site>
 Unaffiliated <no@organization.net> Mykola Golub <to.my.trociny@gmail.com>
 Unaffiliated <no@organization.net> mychoxin <mychoxin@gmail.com>
 Unaffiliated <no@organization.net> Myna Vajha <mynaramana@gmail.com>
+Unaffiliated <no@organization.net> Nathan Weinberg <nathan2@stwmd.net>
 Unaffiliated <no@organization.net> Neha Ummareddy <nehaummareddy@gmail.com>
+Unaffiliated <no@organization.net> Neha Gupta <gnehapk@gmail.com>
 Unaffiliated <no@organization.net> Nick Erdmann <n@nirf.de>
 Unaffiliated <no@organization.net> Nick Fisk <nick@fisk.me.uk>
 Unaffiliated <no@organization.net> Nicolas Yong <nicolas.yong93@gmail.com>
@@ -830,6 +910,7 @@ Unaffiliated <no@organization.net> Patrick Donnelly <batrick@batbytes.com>
 Unaffiliated <no@organization.net> Pavani Rajula <rpavani1998@gmail.com>
 Unaffiliated <no@organization.net> Paul Emmerich <paul.emmerich@oocero.de>
 Unaffiliated <no@organization.net> Peng Zhang <zphj1987@gmail.com>
+Unaffiliated <no@organization.net> Peng Wang <wp389@126.com>
 Unaffiliated <no@organization.net> Peter Keresztes Schmidt <carbenium@outlook.com>
 Unaffiliated <no@organization.net> Peter Maloney <peter.maloney@yahoo.ca
 Unaffiliated <no@organization.net> Peter Woodman <peter@shortbus.org>
@@ -839,7 +920,9 @@ Unaffiliated <no@organization.net> Piotr Dałek <git@predictor.org.pl>
 Unaffiliated <no@organization.net> Qinghua Jin <qhjin_dev@163.com>
 Unaffiliated <no@organization.net> Rachana Patel <rachana83.patel@gmail.com>
 Unaffiliated <no@organization.net> Rahul Aggarwal <rahul.1aggarwal@gmail.com>
+Unaffiliated <no@organization.net> Ranjitha G <ranjitha.kmg@gmail.com>
 Unaffiliated <no@organization.net> Rishabh Kumar <kris.kr296@gmail.com>
+Unaffiliated <no@organization.net> Rishabh Dave <rishabhddave@gmail.com>
 Unaffiliated <no@organization.net> Roberto Oliveira <robertoguimaraes8@gmail.com>
 Unaffiliated <no@organization.net> Robin Dehu <robindehu@gmail.com>
 Unaffiliated <no@organization.net> Robin Tang <robintang974@gmail.com>
@@ -852,10 +935,12 @@ Unaffiliated <no@organization.net> Rust Shen <rustinpeace@163.com>
 Unaffiliated <no@organization.net> Ryne Li <lizhenqiangsnake@gmail.com>
 Unaffiliated <no@organization.net> Sahithi R V <tansy.rv@gmail.com>
 Unaffiliated <no@organization.net> Sam Zaydel <szaydel@gmail.com>
+Unaffiliated <no@organization.net> Sandor Zeestraten <sandor@zeestrataca.com>
 Unaffiliated <no@organization.net> Sarthak Munshi <sarthakmunshi@gmail.com>
 Unaffiliated <no@organization.net> Saumay Agrawal <saumay.agrawal@gmail.com>
 Unaffiliated <no@organization.net> Sebastien Chen <sebastien.chen92@gmail.com>
 Unaffiliated <no@organization.net> Sergey Arkhipov <nineseconds@yandex.ru>
+Unaffiliated <no@organization.net> sdnets <sdnets2018@gmail.com>
 Unaffiliated <no@organization.net> Shang Ding <dingshang2013@163.com>
 Unaffiliated <no@organization.net> Shanggao Qiu <qiushanggao@qq.com>
 Unaffiliated <no@organization.net> Shawn Chen <cxwshawn@gmail.com>
@@ -865,6 +950,7 @@ Unaffiliated <no@organization.net> Simon Guinot <simon.guinot@sequanux.org>
 Unaffiliated <no@organization.net> Simran Singhal <singhalsimran0@gmail.com>
 Unaffiliated <no@organization.net> Song Xinying <songxinying.ftd@gmail.com>
 Unaffiliated <no@organization.net> Spandan Kumar Sahu <spandankumarsahu@gmail.com>
+Unaffiliated <no@organization.net> Stefan Kooman <stefan@bit.nl>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
 Unaffiliated <no@organization.net> Taeksang Kim <voidbag@gmail.com>
@@ -872,10 +958,16 @@ Unaffiliated <no@organization.net> Tahia Khan <tahia.khan@gmail.com>
 Unaffiliated <no@organization.net> Ted-Chang <ted.g.zhang@live.com>
 Unaffiliated <no@organization.net> Thomas Johnson <ntmatter@gmail.com>
 Unaffiliated <no@organization.net> Thomas Laumondais <thomas.laumondais@gmail.com>
+Unaffiliated <no@organization.net> Thore Kruess <thore@kruess.xyz>
 Unaffiliated <no@organization.net> Tim Bishop <tim@bishnet.net>
 Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
+Unaffiliated <no@organization.net> Tina Kallio <tina.kallio@gmail.com>
 Unaffiliated <no@organization.net> Tobias Gall <tobias.gall@mailbox.org>
 Unaffiliated <no@organization.net> Tobias Suckow <tobias@suckow.biz>
+Unaffiliated <no@organization.net> TommyLike <tommylikehu@gmail.com>
+Unaffiliated <no@organization.net> Timofey Titovets <nefelim4ag@gmail.com>
+Unaffiliated <no@organization.net> Thore Kruess <thore@kruess.xyz>
+Unaffiliated <no@organization.net> Tsung-Ju Lii <usefulalgorithm@gmail.com>
 Unaffiliated <no@organization.net> Tyler Zeqing Qi <aqize@126.com>
 Unaffiliated <no@organization.net> Uday Mullangi <udaymjl@gmail.com>
 Unaffiliated <no@organization.net> Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com>
@@ -893,6 +985,7 @@ Unaffiliated <no@organization.net> William A. Kennington III <william@wkenningto
 Unaffiliated <no@organization.net> Wilson E. Alvarez <wilson.e.alvarez1@gmail.com>
 Unaffiliated <no@organization.net> Wu Jian <wujian3659@163.com>
 Unaffiliated <no@organization.net> Xan Peng <xanpeng@gmail.com>
+Unaffiliated <no@organization.net> Xiang Dai <764524258@qq.com>
 Unaffiliated <no@organization.net> Xiaojun Liao <xiaojunliao85@gmail.com>
 Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
 Unaffiliated <no@organization.net> Xin Liao <liaoxinbit@gmail.com>
@@ -911,6 +1004,7 @@ Unaffiliated <no@organization.net> Yao Zongyou <yaozongyou@vip.qq.com>
 Unaffiliated <no@organization.net> Yatin Kumbhare <yatinkumbhare@gmail.com>
 Unaffiliated <no@organization.net> YiQiang Chen <cyqsign@163.com>
 Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
+Unaffiliated <no@organization.net> YongSheng Zhang <ptozys@gmail.com>
 Unaffiliated <no@organization.net> You Ji <jiyou09@gmail.com>
 Unaffiliated <no@organization.net> Yuelong Guang <yuelongguang@gmail.com>
 Unaffiliated <no@organization.net> Yupeng Chen <chenyupeng-it@360.cn>
@@ -923,8 +1017,10 @@ Unaffiliated <no@organization.net> Zhao Kun <jswps2011@163.com>
 Unaffiliated <no@organization.net> Zhe Zhang <zzxuanyuan@gmail.com>
 Unaffiliated <no@organization.net> Zhicheng Wei <zhicheng@opensourceforge.net>
 Unaffiliated <no@organization.net> Zhou Rui Song <236131368@qq.com>
+Unaffiliated <no@organization.net> Zhou Peng <p@ctriple.cn>
 Unaffiliated <no@organization.net> Zhou Zhengping <johnzzpcrystal@gmail.com>
 Unaffiliated <no@organization.net> Zhuang Xiaochun <zhuangxc89@163.com>
+Unaffiliated <no@organization.net> Zhu Jie Wen <jabber256@gmail.com>
 UnionPay <contact@unionpay.com> Liao Weizhong <liaoweizhong@unionpay.com>
 UnionPay <contact@unionpay.com> Lin Xu Hua <linxuhua@unionpay.com>
 UnionPay <contact@unionpay.com> Zhang Wen <zhangwen1@unionpay.com>
@@ -956,6 +1052,7 @@ University of Michigan <contact@umich.edu> My Do <mhdo@umich.edu>
 University of Toronto <contact@mail.utoronto.ca> Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca>
 University of Utah <contact@utah.edu> Xing Lin <xinglin@cs.utah.edu>
 University of Wisconsin <contact@wisc.edu> Bruce Flynn <brucef@ssec.wisc.edu>
+Vico Research <contact@vico-research.com> Marc Schoechlin <marc.schoechlin@vico-research.com>
 Virtuozzo <contact@virtuozzo.com> Andrey Parfenov <aparfenov@virtuozzo.com>
 Viva64 <contact@viva64.com> Svyatoslav <razmyslov@viva64.com>
 VRT <contact@vrt.com.au> Stuart Longland <stuartl@vrt.com.au>
@@ -970,6 +1067,7 @@ Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 Wikia <contact@wikia-inc.com> Lukasz Jagiello <lukasz@wikia-inc.com>
 X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
 X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
+XSky <contact@xsky.com> Shang Ding <dingshang@xsky.com>
 XSky <contact@xsky.com> Huang Jun <huangjun@xsky.com>
 XSky <contact@xsky.com> hechuang <hechuang@xsky.com>
 XSky <contact@xsky.com> Haomai Wang <haomai@xsky.com>
@@ -997,8 +1095,9 @@ ZTE <contact@zte.com.cn> Chuanhong Wang <wang.chuanhong@zte.com.cn>
 ZTE <contact@zte.com.cn> clove <clove@zte.com.cn>
 ZTE <contact@zte.com.cn> Gong Chuang <gong.chuang@zte.com.cn>
 ZTE <contact@zte.com.cn> Lan De <lan.de3@zte.com.cn>
+ZTE <contact@zte.com.cn> Li Bingyang <li.bingyang1@zte.com.cn>
 ZTE <contact@zte.com.cn> Luo Kexue <luo.kexue@zte.com.cn>
-ZTE <contact@zte.com.cn> Luo Runbing <runsisi@zte.com.cn>
+ZTE <contact@zte.com.cn> Luo Runbing <luo.runbing@zte.com.cn>
 ZTE <contact@zte.com.cn> Ren Huanwen <ren.huanwen@zte.com.cn>
 ZTE <contact@zte.com.cn> Shun Song <song.shun3@zte.com.cn>
 ZTE <contact@zte.com.cn> Song Baisen <song.baisen@zte.com.cn>
@@ -1012,6 +1111,10 @@ ZTE <contact@zte.com.cn> Yan Jun <yan.jun8@zte.com.cn>
 ZTE <contact@zte.com.cn> Zhang Zezhu <zhang.zezhu@zte.com.cn>
 ZTE <contact@zte.com.cn> Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
 ZTE <contact@zte.com.cn> Zou Aiguo <zou.aiguo@zte.com.cn>
+ZTE <contact@zte.com.cn> Chi Zhang <zhang.chi85@zte.com.cn>
+ZTE <contact@zte.com.cn> Liu Wei <liu.wei8196@zte.com.cn>
+ZTE <contact@zte.com.cn> Chen Zhenghua <chen.zhenghua@zte.com.cn>
+ZTE <contact@zte.com.cn> Yan Jun <yan.jun8@zte.com.cn>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \