[PATCH v3 00/19] mailmap: Add more entries to sanitize 'git log' output

[PATCH v3 00/19] 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

Since v3:
- Split 1 patch per developer, Cc'ing each developer (lvivier)

Philippe Mathieu-Daudé (19):
  .mailmap: Update Alexander Graf email address
  .mailmap: Update Paul Burton email address
  .mailmap: Display Andreas Faerber name with diaeresis
  .mailmap: Display correct email address for Arei Gonglei
  .mailmap: Display correctly Chen Fan name
  .mailmap: Display correct email address for Christoph Hellwig
  .mailmap: Display Disheng Su name correctly
  .mailmap: Display Hiroyuki Obinata name correctly
  .mailmap: Display correct email address for Jean-Christophe Dubois
  .mailmap: Display Jia Lina name correctly
  .mailmap: Display Lili Huang name correctly
  .mailmap: Display Marek Dolata name properly
  .mailmap: Display correct email address for Michael S. Tsirkin
  .mailmap: Display correct email address for Michael Tokarev
  .mailmap: Display correct email address for Peter Maydell
  .mailmap: Display correct email address for Richard Henderson
  .mailmap: Display correct email address for Stefan Berger
  .mailmap: Display correct email address for Stefan Weil
  .mailmap: Display Ying Fang name correctly

 .mailmap | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

-- 
2.21.3

[PATCH v3 01/19] .mailmap: Update Alexander Graf email address

[Philippe Mathieu-Daudé]

Update Alexander Graf email address to avoid emails bouncing.

Suggested-by: Alexander Graf <agraf@csgraf.de>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 926cac6bb8..e46e6c7302 100644
--- a/.mailmap
+++ b/.mailmap
@@ -44,6 +44,7 @@ Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgte
 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
+Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
 Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
 Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
 Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
-- 
2.21.3

[PATCH v3 02/19] .mailmap: Update Paul Burton email address

[Philippe Mathieu-Daudé]

Update Paul Burton email address to avoid emails bouncing.

Cc: Paul Burton <paulburton@kernel.org>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index e46e6c7302..b1e4cd97ad 100644
--- a/.mailmap
+++ b/.mailmap
@@ -50,9 +50,10 @@ Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
 Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
-Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
-Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
-Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
+Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
+Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
+Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
+Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
 Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
 Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
-- 
2.21.3

[PATCH v3 03/19] .mailmap: Display Andreas Faerber name with diaeresis

[Philippe Mathieu-Daudé]

Fix Andreas Färber name in the following commits:

  $ git log --format=fuller --author='Andreas Faerber <andreas.faerber@web.de>' --oneline
  165ceac095 qemu-timer: Move include for __FreeBSD_version to header
  5d7ff5bbde TCG: Mac OS X support for ppc64 target
  ea5ad306ba Suppress optionrom build on Solaris x86

Cc: Färber <andreas.faerber@web.de>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b1e4cd97ad..a539ae8222 100644
--- a/.mailmap
+++ b/.mailmap
@@ -64,6 +64,7 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
 Alexey Gerasimenko <x1917x@gmail.com>
 Alex Ivanov <void@aleksoft.net>
 Andreas Färber <afaerber@suse.de>
+Andreas Färber <andreas.faerber@web.de>
 Bandan Das <bsd@redhat.com>
 Benjamin MARSILI <mlspirat42@gmail.com>
 Benoît Canet <benoit.canet@gmail.com>
-- 
2.21.3

[PATCH v3 04/19] .mailmap: Display correct email address for Arei Gonglei

[Philippe Mathieu-Daudé]

Fix Arei Gonglei email address in the following commits:

  $ git log --committer='<root@ceth6.(none)>' --oneline
  ddcd55316f bootdevice: add Error **errp argument for QEMUBootSetHandler
  3b08098b40 bootdevice: add validate check for qemu_boot_set()
  f1839938b0 bootdevice: add Error **errp argument for qemu_boot_set()
  703008e81a bootdevice: add Error **errp argument for validate_bootdevices()
  9816833d3b bootdevice: move code about bootorder from vl.c to bootdevice.c

Cc: Arei Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index a539ae8222..dbf674066f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,8 @@ Alexey Gerasimenko <x1917x@gmail.com>
 Alex Ivanov <void@aleksoft.net>
 Andreas Färber <afaerber@suse.de>
 Andreas Färber <andreas.faerber@web.de>
+Arei Gonglei <arei.gonglei@huawei.com>
+Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
 Bandan Das <bsd@redhat.com>
 Benjamin MARSILI <mlspirat42@gmail.com>
 Benoît Canet <benoit.canet@gmail.com>
@@ -90,7 +92,6 @@ Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
 Gautham R. Shenoy <ego@in.ibm.com>
 Gautham R. Shenoy <ego@linux.vnet.ibm.com>
-Gonglei (Arei) <arei.gonglei@huawei.com>
 Guang Wang <wang.guang55@zte.com.cn>
 Hailiang Zhang <zhang.zhanghailiang@huawei.com>
 Hervé Poussineau <hpoussin@reactos.org>
-- 
2.21.3

[PATCH v3 05/19] .mailmap: Display correctly Chen Fan name

[Philippe Mathieu-Daudé]

Fix Chen Fan name in the following commit:

  $ git log --author='chenfan <chen.fan.fnst@cn.fujitsu.com>' --oneline
 5bb4c35dca target-i386/cpu.c: Fix two error output indentation

Cc: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index dbf674066f..1d444e4fce 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,6 +79,7 @@ Brijesh Singh <brijesh.singh@amd.com>
 Brilly Wu <brillywu@viatech.com.cn>
 Cédric Vincent <cedric.vincent@st.com>
 CheneyLin <linzc@zju.edu.cn>
+Chen Fan <chen.fan.fnst@cn.fujitsu.com>
 Chen Gang <chengang@emindsoft.com.cn>
 Chen Gang <gang.chen.5i5j@gmail.com>
 Chen Gang <gang.chen@sunrus.com.cn>
-- 
2.21.3

[PATCH v3 06/19] .mailmap: Display correct email address for Christoph Hellwig

[Philippe Mathieu-Daudé]

Fix Christoph Hellwig email address in the following commit:

  $ git log --author='hch@lst.de <hch@lst.de>' --oneline
  37d5ddd6f4 virtio-blk: revert serial number support

Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 1d444e4fce..8c8bbcf2e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -85,6 +85,7 @@ Chen Gang <gang.chen.5i5j@gmail.com>
 Chen Gang <gang.chen@sunrus.com.cn>
 Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
 Christophe Lyon <christophe.lyon@st.com>
+Christoph Hellwig <hch@lst.de>
 Collin L. Walling <walling@linux.ibm.com>
 Daniel P. Berrangé <berrange@redhat.com>
 Eduardo Otubo <otubo@redhat.com>
-- 
2.21.3

[PATCH v3 07/19] .mailmap: Display Disheng Su name correctly

[Philippe Mathieu-Daudé]

Fix Disheng Su name in the following commit:

  $ git log --author=edison@cloud.com --oneline
  51ef67270b Copy snapshots out of QCOW2 disk

Cc: Disheng Su <edison@cloud.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 8c8bbcf2e0..ce0d62b60d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,6 +88,7 @@ Christophe Lyon <christophe.lyon@st.com>
 Christoph Hellwig <hch@lst.de>
 Collin L. Walling <walling@linux.ibm.com>
 Daniel P. Berrangé <berrange@redhat.com>
+Disheng Su <edison@cloud.com>
 Eduardo Otubo <otubo@redhat.com>
 Fabrice Desclaux <fabrice.desclaux@cea.fr>
 Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
-- 
2.21.3

[PATCH v3 08/19] .mailmap: Display Hiroyuki Obinata name correctly

[Philippe Mathieu-Daudé]

Correctly display Hiroyuki Obinata name in the following commit:

 $ git log --author=hiroyuki.obinata@gmail.com --oneline
 f480f6e8c5 remove unnecessary ifdef TARGET_RISCV64

Cc: Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index ce0d62b60d..4e9e54368d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,6 +98,7 @@ Gautham R. Shenoy <ego@linux.vnet.ibm.com>
 Guang Wang <wang.guang55@zte.com.cn>
 Hailiang Zhang <zhang.zhanghailiang@huawei.com>
 Hervé Poussineau <hpoussin@reactos.org>
+Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
 Jakub Jermář <jakub@jermar.eu>
 Jakub Jermář <jakub.jermar@kernkonzept.com>
 Jean-Christophe Dubois <jcd@tribudubois.net>
-- 
2.21.3

[PATCH v3 09/19] .mailmap: Display correct email address for Jean-Christophe Dubois

[Philippe Mathieu-Daudé]

Fix Jean-Christophe Dubois email address in the following commit:

  $ git log --author='jcd@jcd-laptop.(none)' --oneline
  5d92886792 fix qemu_alloc/qemu_free for audio subsystem

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 4e9e54368d..66118f3d1e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Hiroyuki Obinata <hiroyuki.obinata@gmail.com>
 Jakub Jermář <jakub@jermar.eu>
 Jakub Jermář <jakub.jermar@kernkonzept.com>
 Jean-Christophe Dubois <jcd@tribudubois.net>
+Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
 Jindřich Makovička <makovick@gmail.com>
 John Arbuckle <programmingkidx@gmail.com>
 Juha Riihimäki <juha.riihimaki@nokia.com>
-- 
2.21.3

[PATCH v3 10/19] .mailmap: Display Jia Lina name correctly

[Philippe Mathieu-Daudé]

Correctly display Jia Lina name in the following commits:

  $ git log --author=jialina01@baidu.com
  commit 3d63da16fbcd05405efd5946000cdb45474a9bad
  Author: Jia Lina <jialina01@baidu.com>

  commit be1d2c49eac647f55172bce8e56ec09745c8d045
  Author: jialina01 <jialina01@baidu.com>

Cc: Jia Lina <jialina01@baidu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 66118f3d1e..70a9848cfe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -103,6 +103,7 @@ Jakub Jermář <jakub@jermar.eu>
 Jakub Jermář <jakub.jermar@kernkonzept.com>
 Jean-Christophe Dubois <jcd@tribudubois.net>
 Jean-Christophe Dubois <jcd@tribudubois.net> <jcd@jcd-laptop.(none)>
+Jia Lina <jialina01@baidu.com>
 Jindřich Makovička <makovick@gmail.com>
 John Arbuckle <programmingkidx@gmail.com>
 Juha Riihimäki <juha.riihimaki@nokia.com>
-- 
2.21.3

[PATCH v3 11/19] .mailmap: Display Lili Huang name correctly

[Philippe Mathieu-Daudé]

Correctly display Lili Huang name in the following commits:

  $ git log --committer=huanglili.huang@huawei.com --oneline
  76349f5ba8 bootdevice: add check in restore_boot_order()
  f05f47bb5f bootdevice: check boot order argument validation before vm running

Cc: Lili Huang <huanglili.huang@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 70a9848cfe..efb012f357 100644
--- a/.mailmap
+++ b/.mailmap
@@ -112,6 +112,7 @@ Jun Li <junmuzi@gmail.com>
 Laurent Vivier <Laurent@lvivier.info>
 Leandro Lupori <leandro.lupori@gmail.com>
 Li Guang <lig.fnst@cn.fujitsu.com>
+Lili Huang <huanglili.huang@huawei.com>
 Liming Wang <walimisdev@gmail.com>
 linzhecheng <linzc@zju.edu.cn>
 Liran Schour <lirans@il.ibm.com>
-- 
2.21.3

[PATCH v3 12/19] .mailmap: Display Marek Dolata name properly

[Philippe Mathieu-Daudé]

Properly display Marek Dolata name in the following commit:

  $ git log --author=mkdolata@us.ibm.com
  commit 5a07192a042e60ce7415279a48aff8a932829f55
  Author: mkdolata@us.ibm.com <mkdolata@us.ibm.com>
  ...
  Signed-off-by: Marek Dolata <mkdolata@us.ibm.com>

Cc: Marek Dolata <mkdolata@us.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index efb012f357..3219bb5d4f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -127,6 +127,7 @@ Luc Michel <luc.michel@git.antfield.fr>
 Luc Michel <luc.michel@greensocs.com>
 Marc Marí <marc.mari.barcelo@gmail.com>
 Marc Marí <markmb@redhat.com>
+Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
 Munkyu Im <munkyu.im@samsung.com>
-- 
2.21.3

[PATCH v3 13/19] .mailmap: Display correct email address for Michael S. Tsirkin

[Philippe Mathieu-Daudé]

Fix Michael S. Tsirkin email address in the following commits:

  $ git log --committer='mst@robin.(none)' --oneline
  572992eefa msix: Switch msix_uninit to return void
  5a2c202981 msix: Allow full specification of MSIX layout
  d35e428c84 msix: Split PBA into it's own MemoryRegion
  2cf62ad742 msix: Note endian TODO item
  eebcb0a76a msix: Move msix_mmio_read
  b2357c484d virtio: Convert to msix_init_exclusive_bar() interface
  1116b53921 ivshmem: Convert to msix_init_exclusive_bar() interface
  53f949254a msix: Add simple BAR allocation MSIX setup functions
  118f2c2b48 msix: fix PCIDevice naming inconsistency
  393a98924e msix: drop unused msix_bar_size, require valid bar_size

Cc: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 3219bb5d4f..eaed43a178 100644
--- a/.mailmap
+++ b/.mailmap
@@ -130,6 +130,7 @@ Marc Marí <markmb@redhat.com>
 Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
+Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
 Munkyu Im <munkyu.im@samsung.com>
 Nicholas Bellinger <nab@linux-iscsi.org>
 Nicholas Thomas <nick@bytemark.co.uk>
-- 
2.21.3

[PATCH v3 14/19] .mailmap: Display correct email address for Michael Tokarev

[Philippe Mathieu-Daudé]

Fix Michael Tokarev email address in the following commits:

  $ git log --committer=mjt@gandalf --oneline
  eb83c2030a hw/net/e1000e: Fix compiler warning
  5ce747cfac target-m68k: fix get_mac_extf helper
  3224e8786f timer/cpus: fix some typos and update some comments
  04ecbb7834 timer.h: fix inconsistency between comment and function prototype
  083b96e221 timer.h: fix typo
  e2f310ec38 maint: Ignore generated version file
  32945472ce Document that curses usually needs -k option too
  deff0ddb86 trace-event: display "%d" instead of "0x%d"
  8223f345b9 linux-user, trivial: display "0x%x" instead of "0x%d"
  8928473699 pic: fix typo in error message: KVM_GET_IRQCHIP -> KVM_SET_IRQCHIP
  a337f295de sparc: Use g_memdup() instead of g_new0() + memcpy()
  bc82585a8f vl: remove unnecessary duplicate call to tpm_cleanup
  39cba610a7 arm: spelling fix: mismatch
  0aadb5a15f hw/dma/omap: spelling fix: endianness
  270a4b6739 hw/bt/hci: spelling fix: endianness
  37e3645ad3 docs: Fix description of the leaky bucket algorithm in throttle.txt

Cc: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index eaed43a178..9bc80771e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,6 +131,7 @@ Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
 Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
+Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>
 Munkyu Im <munkyu.im@samsung.com>
 Nicholas Bellinger <nab@linux-iscsi.org>
 Nicholas Thomas <nick@bytemark.co.uk>
-- 
2.21.3

[PATCH v3 15/19] .mailmap: Display correct email address for Peter Maydell

[Philippe Mathieu-Daudé]

Fix Peter Maydell email address in the following commit:

  $ git log --format=fuller --committer='petmay01@cam-vm-266.(none)'
  commit 0d4abda8f7328c8911c1d020bb6961650eaf7801
  Author:     Peter Maydell <peter.maydell@linaro.org>
  AuthorDate: Fri Jul 20 13:34:49 2012 +0100
  Commit:     Peter Maydell <petmay01@cam-vm-266.(none)>
  CommitDate: Fri Jul 20 13:34:49 2012 +0100

Cc: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 9bc80771e0..2fa882d239 100644
--- a/.mailmap
+++ b/.mailmap
@@ -144,6 +144,7 @@ Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
 Peter Crosthwaite <crosthwaite.peter@gmail.com>
 Peter Crosthwaite <peter.crosthwaite@petalogix.com>
 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+Peter Maydell <peter.maydell@linaro.org> <petmay01@cam-vm-266.(none)>
 Prasad J Pandit <pjp@fedoraproject.org>
 Prasad J Pandit <ppandit@redhat.com>
 Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
-- 
2.21.3

[PATCH v3 16/19] .mailmap: Display correct email address for Richard Henderson

[Philippe Mathieu-Daudé]

Fix Richard Henderson email address in the following commit:

  $ git log --author=rth@anchor.twiddle.home --oneline
  7c5a90dd41 target-alpha: Fix gdb access to fpcr and unique.

Cc: Richard Henderson <rth@twiddle.net>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 2fa882d239..b06baa094e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -150,6 +150,7 @@ Prasad J Pandit <ppandit@redhat.com>
 Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 Remy Noel <remy.noel@blade-group.com>
+Richard Henderson <rth@twiddle.net> <rth@anchor.twiddle.home>
 Roger Pau Monné <roger.pau@citrix.com>
 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
-- 
2.21.3

[PATCH v3 17/19] .mailmap: Display correct email address for Stefan Berger

[Philippe Mathieu-Daudé]

Fix Stefan Berger email address in the following commit:

  $ git log --author='Stefan Berger stefanb@linux.vnet.ibm.com' --oneline
  4a42fa0ee2 acpi: Update TPM2 ACPI table to more recent specs

Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b06baa094e..67f7d5caf2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -155,6 +155,7 @@ Roger Pau Monné <roger.pau@citrix.com>
 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 Sochin Jiang <sochin.jiang@huawei.com>
+Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 Thomas Huth <thuth@redhat.com>
 Thomas Knych <thomaswk@google.com>
-- 
2.21.3

[PATCH v3 18/19] .mailmap: Display correct email address for Stefan Weil

[Philippe Mathieu-Daudé]

Fix Stefan Weil email address in the following commit:

  $ git log --author='stefan@kiwi.(none)' --oneline
  f880defbb0 block/vpc: Fix size calculation

Also unify his email in the following commits:

  $ git log --author='weil@mail.berlios.de' --oneline | head
  9e4dd565b4 vnc: Limit r/w access to size of allocated memory
  657c166f8e qemu-iotests: README: Fix spelling
  3b5fe6e60c qemu-iotests: add support for vdi format "static" option
  c83f64d498 qemu-iotests: fix pattern for write test
  7ef6d3dc39 block/vvfat: Remove unused code
  ce137829e7 block/vvfat: Fix potential memory leaks and other memory errors
  5354d08312 Fix mismatching allocation and deallocation
  7f6f0ae5b9 tcg: Add some assertions
  c0ad3001bf tcg: Add forward declarations for local functions
  840f58617b tcg: Don't declare TCG_TARGET_REG_BITS in tcg-target.h
  ...

Cc: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 67f7d5caf2..f5ca5aa37e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -156,6 +156,9 @@ Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 Sochin Jiang <sochin.jiang@huawei.com>
 Stefan Berger <stefanb@linux.ibm.com> <Stefan Berger stefanb@linux.vnet.ibm.com>
+Stefan Weil <sw@weilnetz.de> <stefan@kiwi.(none)>
+Stefan Weil <sw@weilnetz.de> <stefan@weilnetz.de>
+Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 Thomas Huth <thuth@redhat.com>
 Thomas Knych <thomaswk@google.com>
-- 
2.21.3

[PATCH v3 19/19] .mailmap: Display Ying Fang name correctly

[Philippe Mathieu-Daudé]

Correctly display Ying Fang name in the following commit:

  $ git log --author=fangying1@huawei.com
  commit 9e6f8d8aab3afe6d704054e3fd850bcba5aa20f7
  Author: fangying <fangying1@huawei.com>
  Date:   Tue Jun 16 10:32:29 2020 +0100
  ...
  Signed-off-by: Ying Fang <fangying1@huawei.com>

Cc: Ying Fang <fangying1@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index f5ca5aa37e..4352030af5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -177,6 +177,7 @@ Xiaoqiang Zhao <zxq_yx_007@163.com>
 Xinhua Cao <caoxinhua@huawei.com>
 Xiong Zhang <xiong.y.zhang@intel.com>
 Yin Yin <yin.yin@cs2c.com.cn>
+Ying Fang <fangying1@huawei.com>
 Yu-Chen Lin <npes87184@gmail.com>
 Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
 YunQiang Su <syq@debian.org>
-- 
2.21.3

Re: [PATCH v3 00/19] mailmap: Add more entries to sanitize 'git log' output

[no-reply]

Patchew URL: https://patchew.org/QEMU/20200702173818.14651-1-f4bug@amsat.org/



Hi,

This series failed build test on FreeBSD host. Please find the details below.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
if qemu-system-x86_64 --help >/dev/null 2>&1; then
  QEMU=qemu-system-x86_64
elif /usr/libexec/qemu-kvm --help >/dev/null 2>&1; then
  QEMU=/usr/libexec/qemu-kvm
else
  exit 1
fi
make vm-build-freebsd J=21 QEMU=$QEMU
exit 0
=== TEST SCRIPT END ===




The full log is available at
http://patchew.org/logs/20200702173818.14651-1-f4bug@amsat.org/testing.FreeBSD/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PATCH v3 14/19] .mailmap: Display correct email address for Michael Tokarev

[Michael Tokarev]

02.07.2020 20:38, Philippe Mathieu-Daudé wrote:
> Fix Michael Tokarev email address in the following commits:
> 
>   $ git log --committer=mjt@gandalf --oneline

Heh. It was a misconfiguration on my part which I haven't noticed
for quite some time.  Dunno if it's worth the effort to fix that
now, since all the commits are old (in 2016), and all are trivial.

/mjt

Re: [PATCH v3 01/19] .mailmap: Update Alexander Graf email address

[Alexander Graf]

> Am 02.07.2020 um 19:38 schrieb Philippe Mathieu-Daudé <f4bug@amsat.org>:
> 
> Update Alexander Graf email address to avoid emails bouncing.
> 
> Suggested-by: Alexander Graf <agraf@csgraf.de>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Thanks a lot!

Reviewed-by: Alexander Graf <agraf@csgraf.de>

Alex

> ---
> .mailmap | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 926cac6bb8..e46e6c7302 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -44,6 +44,7 @@ Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgte
> Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
> Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
> Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
> +Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
> Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
> Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
> Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
> -- 
> 2.21.3
> 

Re: [PATCH v3 14/19] .mailmap: Display correct email address for Michael Tokarev

[Philippe Mathieu-Daudé]

+Alex/Laurent

On 7/2/20 8:45 PM, Michael Tokarev wrote:
> 02.07.2020 20:38, Philippe Mathieu-Daudé wrote:
>> Fix Michael Tokarev email address in the following commits:
>>
>>   $ git log --committer=mjt@gandalf --oneline
> 
> Heh. It was a misconfiguration on my part which I haven't noticed
> for quite some time.  Dunno if it's worth the effort to fix that
> now, since all the commits are old (in 2016), and all are trivial.

So this all started when Alex added the contrib/gitdm/ scripts,
I noted various encoding discrepancy. Alex merged the first patch
directly as commit 1fed8f0044 ("mailmap: Add many entries to
improve 'git shortlog' statistics"), then Markus asked me to
justify each alias fixed with a commit with a combination of
(broken author email + good S-o-b tag). Then Markus gave his
R-b tag, but Alex was busy so I asked it could go via the trivial
tree. Laurent said OK but I had to split in 1 patch per person,
and each person should Ack his own line.
With this v3 I complied with all previous reviews, but I guess
I failed at explaining why/how this started. As this is an
amazing use of my time, I wanted to get over it, maybe too
quickly. So now I'll respin a v4 with more detailed explanation,
suggesting each person to either Ack/Nack each patch, then give
up.

Re: [PATCH v3 01/19] .mailmap: Update Alexander Graf email address

[Laurent Vivier]

Le 02/07/2020 à 19:38, Philippe Mathieu-Daudé a écrit :
> Update Alexander Graf email address to avoid emails bouncing.
> 
> Suggested-by: Alexander Graf <agraf@csgraf.de>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 926cac6bb8..e46e6c7302 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -44,6 +44,7 @@ Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgte
>  Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
>  Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
>  Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
> +Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
>  Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
>  Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
>  Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
> 

Applied to my trivial-patches-for-5.1 branch.

Thanks,
Laurent

Re: [PATCH v3 00/19] mailmap: Add more entries to sanitize 'git log' output

[Ed Maste]

On Thu, 2 Jul 2020 at 14:12, <no-reply@patchew.org> wrote:
>
> Patchew URL: https://patchew.org/QEMU/20200702173818.14651-1-f4bug@amsat.org/
>
> Hi,
>
> This series failed build test on FreeBSD host. Please find the details below.

I had a look at this (because it's a FreeBSD report); it appears to
have been a temporary connectivity issue.

> fatal: unable to access 'https://github.com/patchew-project/qemu/': Failed connect to github.com:443; Connection timed out