[PATCH v2] mailmap: Add more entries to sanitize 'git log' output

[Philippe Mathieu-Daudé]

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