Most of these developers have the Signed-off-by tag properly
written, but not the author/committer name. Fix this.
Also we incorrectly wrote Arei Gonglei name, update and reorder.

The committer name/email is displayed when using:

  $ git log --format=fuller

(which can be set in git-config setting format.pretty=fuller).

Example of commits with miswritten committer email:
  3b08098b40 76349f5ba8 eb83c2030a 572992eefa 0d4abda8f7

Note: git-log does not use this file by default until you specify
the --use-mailmap flag:

  $ git log --use-mailmap

Reviewed-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
v2:
- Added Marek Dolata (commit 5a07192a0)
- Describe git-log --format=fuller
- Added Markus R-b
---
 .mailmap | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 3816e4effe..cf981a3ec0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -56,6 +56,10 @@ Aaron Lindsay <aa...@os.amperecomputing.com>
 Alexey Gerasimenko <x19...@gmail.com>
 Alex Ivanov <v...@aleksoft.net>
 Andreas Färber <afaer...@suse.de>
+Andreas Färber <andreas.faer...@web.de>
+Andreas Färber <andreas.faer...@web.de> <andreas.faerber>
+Arei Gonglei <arei.gong...@huawei.com>
+Arei Gonglei <arei.gong...@huawei.com> <root@ceth6.(none)>
 Bandan Das <b...@redhat.com>
 Benjamin MARSILI <mlspira...@gmail.com>
 Benoît Canet <benoit.ca...@gmail.com>
@@ -67,27 +71,36 @@ Brad Smith <b...@comstyle.com>
 Brijesh Singh <brijesh.si...@amd.com>
 Brilly Wu <brill...@viatech.com.cn>
 Cédric Vincent <cedric.vinc...@st.com>
+Chai Wen <chaiw.f...@cn.fujitsu.com>
+Chaojian Hu <chaojia...@hotmail.com>
 CheneyLin <li...@zju.edu.cn>
+Chen Fan <chen.fan.f...@cn.fujitsu.com>
 Chen Gang <cheng...@emindsoft.com.cn>
 Chen Gang <gang.chen.5...@gmail.com>
 Chen Gang <gang.c...@sunrus.com.cn>
 Chen Wei-Ren <che...@iis.sinica.edu.tw>
 Christophe Lyon <christophe.l...@st.com>
+Christoph Hellwig <h...@lst.de>
 Collin L. Walling <wall...@linux.ibm.com>
 Daniel P. Berrangé <berra...@redhat.com>
+Disheng Su <edi...@cloud.com>
+Dunrong Huang <riegama...@gmail.com>
 Eduardo Otubo <ot...@redhat.com>
 Fabrice Desclaux <fabrice.descl...@cea.fr>
 Fernando Luis Vázquez Cao <fernando...@lab.ntt.co.jp>
 Fernando Luis Vázquez Cao <ferna...@oss.ntt.co.jp>
 Gautham R. Shenoy <e...@in.ibm.com>
 Gautham R. Shenoy <e...@linux.vnet.ibm.com>
-Gonglei (Arei) <arei.gong...@huawei.com>
 Guang Wang <wang.guan...@zte.com.cn>
 Hailiang Zhang <zhang.zhanghaili...@huawei.com>
 Hervé Poussineau <hpous...@reactos.org>
+Hiroyuki Obinata <hiroyuki.obin...@gmail.com>
 Jakub Jermář <ja...@jermar.eu>
 Jakub Jermář <jakub.jer...@kernkonzept.com>
+Jay Zhou <jianjay.z...@huawei.com>
 Jean-Christophe Dubois <j...@tribudubois.net>
+Jean-Christophe Dubois <j...@tribudubois.net> <jcd@jcd-laptop.(none)>
+Jia Lina <jialin...@baidu.com>
 Jindřich Makovička <makov...@gmail.com>
 John Arbuckle <programmingk...@gmail.com>
 Juha Riihimäki <juha.riihim...@nokia.com>
@@ -96,9 +109,11 @@ Jun Li <junm...@gmail.com>
 Laurent Vivier <laur...@lvivier.info>
 Leandro Lupori <leandro.lup...@gmail.com>
 Li Guang <lig.f...@cn.fujitsu.com>
+Lili Huang <huanglili.hu...@huawei.com>
 Liming Wang <walimis...@gmail.com>
 linzhecheng <li...@zju.edu.cn>
 Liran Schour <lir...@il.ibm.com>
+Li Tianqing <tianq...@unitedstack.com>
 Liu Yu <yu....@freescale.com>
 Liu Yu <yu....@freescale.com>
 Li Zhang <zhlci...@gmail.com>
@@ -110,13 +125,17 @@ Luc Michel <luc.mic...@git.antfield.fr>
 Luc Michel <luc.mic...@greensocs.com>
 Marc Marí <marc.mari.barc...@gmail.com>
 Marc Marí <mar...@redhat.com>
+Marek Dolata <mkdol...@us.ibm.com>
 Michael Avdienko <whitearc...@gmail.com>
 Michael S. Tsirkin <m...@redhat.com>
+Michael S. Tsirkin <m...@redhat.com> <mst@robin.(none)>
+Michael Tokarev <m...@tls.msk.ru> <mjt@gandalf>
 Munkyu Im <munkyu...@samsung.com>
 Nicholas Bellinger <n...@linux-iscsi.org>
 Nicholas Thomas <n...@bytemark.co.uk>
 Nikunj A Dadhania <nik...@linux.vnet.ibm.com>
 Orit Wasserman <owass...@redhat.com>
+Pan Nengyuan <pannengy...@huawei.com>
 Paolo Bonzini <pbonz...@redhat.com>
 Pavel Dovgaluk <dovga...@ispras.ru>
 Pavel Dovgaluk <pavel.dovga...@gmail.com>
@@ -124,15 +143,23 @@ Pavel Dovgaluk <pavel.dovga...@ispras.ru>
 Peter Crosthwaite <crosthwaite.pe...@gmail.com>
 Peter Crosthwaite <peter.crosthwa...@petalogix.com>
 Peter Crosthwaite <peter.crosthwa...@xilinx.com>
+Peter Maydell <peter.mayd...@linaro.org> <petmay01@cam-vm-266.(none)>
 Prasad J Pandit <p...@fedoraproject.org>
 Prasad J Pandit <ppan...@redhat.com>
 Qiao Nuohan <qiaonuo...@cn.fujitsu.com>
 Reimar Döffinger <reimar.doeffin...@gmx.de>
 Remy Noel <remy.n...@blade-group.com>
+Richard Henderson <r...@twiddle.net> <r...@anchor.twiddle.home>
 Roger Pau Monné <roger....@citrix.com>
 Shin'ichiro Kawasaki <kawas...@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawas...@wdc.com>
+Siwei Zhuang <siwei.zhu...@data61.csiro.au>
+Sochin Jiang <soc...@aliyun.com>
 Sochin Jiang <sochin.ji...@huawei.com>
+Stefan Berger <stef...@linux.ibm.com> <Stefan Berger 
stef...@linux.vnet.ibm.com>
+Stefan Weil <s...@weilnetz.de> <stefan@kiwi.(none)>
+Stefan Weil <s...@weilnetz.de> <ste...@weilnetz.de>
+Stefan Weil <s...@weilnetz.de> <w...@mail.berlios.de>
 Takashi Yoshii <takas...@ops.dti.ne.jp>
 Thomas Huth <th...@redhat.com>
 Thomas Knych <thoma...@google.com>
@@ -150,6 +177,7 @@ Wenshuang Ma <kevin...@tencent.com>
 Xiaoqiang Zhao <zxq_yx_...@163.com>
 Xinhua Cao <caoxin...@huawei.com>
 Xiong Zhang <xiong.y.zh...@intel.com>
+Ying Fang <fangyi...@huawei.com>
 Yin Yin <yin....@cs2c.com.cn>
 yuchenlin <npes87...@gmail.com>
 YunQiang Su <s...@debian.org>
-- 
2.21.1


Reply via email to