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

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

  $ git log --use-mailmap

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
 .mailmap | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 3816e4effe..1a859d9e65 100644
--- a/.mailmap
+++ b/.mailmap
@@ -56,6 +56,10 @@ Aaron Lindsay <[email protected]>
 Alexey Gerasimenko <[email protected]>
 Alex Ivanov <[email protected]>
 Andreas Färber <[email protected]>
+Andreas Färber <[email protected]>
+Andreas Färber <[email protected]> <andreas.faerber>
+Arei Gonglei <[email protected]>
+Arei Gonglei <[email protected]> <root@ceth6.(none)>
 Bandan Das <[email protected]>
 Benjamin MARSILI <[email protected]>
 Benoît Canet <[email protected]>
@@ -67,27 +71,36 @@ Brad Smith <[email protected]>
 Brijesh Singh <[email protected]>
 Brilly Wu <[email protected]>
 Cédric Vincent <[email protected]>
+Chai Wen <[email protected]>
+Chaojian Hu <[email protected]>
 CheneyLin <[email protected]>
+Chen Fan <[email protected]>
 Chen Gang <[email protected]>
 Chen Gang <[email protected]>
 Chen Gang <[email protected]>
 Chen Wei-Ren <[email protected]>
 Christophe Lyon <[email protected]>
+Christoph Hellwig <[email protected]>
 Collin L. Walling <[email protected]>
 Daniel P. Berrangé <[email protected]>
+Disheng Su <[email protected]>
+Dunrong Huang <[email protected]>
 Eduardo Otubo <[email protected]>
 Fabrice Desclaux <[email protected]>
 Fernando Luis Vázquez Cao <[email protected]>
 Fernando Luis Vázquez Cao <[email protected]>
 Gautham R. Shenoy <[email protected]>
 Gautham R. Shenoy <[email protected]>
-Gonglei (Arei) <[email protected]>
 Guang Wang <[email protected]>
 Hailiang Zhang <[email protected]>
 Hervé Poussineau <[email protected]>
+Hiroyuki Obinata <[email protected]>
 Jakub Jermář <[email protected]>
 Jakub Jermář <[email protected]>
+Jay Zhou <[email protected]>
 Jean-Christophe Dubois <[email protected]>
+Jean-Christophe Dubois <[email protected]> <jcd@jcd-laptop.(none)>
+Jia Lina <[email protected]>
 Jindřich Makovička <[email protected]>
 John Arbuckle <[email protected]>
 Juha Riihimäki <[email protected]>
@@ -96,9 +109,11 @@ Jun Li <[email protected]>
 Laurent Vivier <[email protected]>
 Leandro Lupori <[email protected]>
 Li Guang <[email protected]>
+Lili Huang <[email protected]>
 Liming Wang <[email protected]>
 linzhecheng <[email protected]>
 Liran Schour <[email protected]>
+Li Tianqing <[email protected]>
 Liu Yu <[email protected]>
 Liu Yu <[email protected]>
 Li Zhang <[email protected]>
@@ -112,11 +127,14 @@ Marc Marí <[email protected]>
 Marc Marí <[email protected]>
 Michael Avdienko <[email protected]>
 Michael S. Tsirkin <[email protected]>
+Michael S. Tsirkin <[email protected]> <mst@robin.(none)>
+Michael Tokarev <[email protected]> <mjt@gandalf>
 Munkyu Im <[email protected]>
 Nicholas Bellinger <[email protected]>
 Nicholas Thomas <[email protected]>
 Nikunj A Dadhania <[email protected]>
 Orit Wasserman <[email protected]>
+Pan Nengyuan <[email protected]>
 Paolo Bonzini <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
@@ -124,15 +142,23 @@ Pavel Dovgaluk <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
+Peter Maydell <[email protected]> <petmay01@cam-vm-266.(none)>
 Prasad J Pandit <[email protected]>
 Prasad J Pandit <[email protected]>
 Qiao Nuohan <[email protected]>
 Reimar Döffinger <[email protected]>
 Remy Noel <[email protected]>
+Richard Henderson <[email protected]> <[email protected]>
 Roger Pau Monné <[email protected]>
 Shin'ichiro Kawasaki <[email protected]>
 Shin'ichiro Kawasaki <[email protected]>
+Siwei Zhuang <[email protected]>
+Sochin Jiang <[email protected]>
 Sochin Jiang <[email protected]>
+Stefan Berger <[email protected]> <Stefan Berger 
[email protected]>
+Stefan Weil <[email protected]> <stefan@kiwi.(none)>
+Stefan Weil <[email protected]> <[email protected]>
+Stefan Weil <[email protected]> <[email protected]>
 Takashi Yoshii <[email protected]>
 Thomas Huth <[email protected]>
 Thomas Knych <[email protected]>
@@ -150,6 +176,7 @@ Wenshuang Ma <[email protected]>
 Xiaoqiang Zhao <[email protected]>
 Xinhua Cao <[email protected]>
 Xiong Zhang <[email protected]>
+Ying Fang <[email protected]>
 Yin Yin <[email protected]>
 yuchenlin <[email protected]>
 YunQiang Su <[email protected]>
-- 
2.21.0


Reply via email to