On 1/18/20 8:10 AM, Markus Armbruster wrote:
Philippe Mathieu-Daudé <phi...@redhat.com> writes:

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é <phi...@redhat.com>
---
  .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 <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)>

I can't find this one in git-log.

I was first surprised:

$ git log -1 3b08098b40
commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
Author:     Gonglei <arei.gong...@huawei.com>
AuthorDate: Wed Dec 3 18:25:46 2014 +0000
Commit:     root <root@ceth6.(none)>
CommitDate: Mon Dec 22 14:39:21 2014 +0800

    bootdevice: add validate check for qemu_boot_set()

    Signed-off-by: Gonglei <arei.gong...@huawei.com>
    Reviewed-by: Markus Armbruster <arm...@redhat.com>

After thinking for a bit I remembered I once changed my default format:

$ git config format.pretty
fuller

I suppose I should add this in the commit description.

  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>

I can't find this one in git-log.

$ git log -1 76349f5ba8
commit 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
Author:     Gonglei <arei.gong...@huawei.com>
AuthorDate: Thu Jan 29 13:13:47 2015 +0000
Commit:     Lili <huanglili.hu...@huawei.com>
CommitDate: Tue Mar 3 13:13:21 2015 +0800

    bootdevice: add check in restore_boot_order()

    qemu_boot_set() can't fail in restore_boot_order(),
    then simply assert it doesn't fail, by passing
    &error_abort if boot_set_handler set.

    Suggested-by: Markus Armbruster <arm...@redhat.com>
    Signed-off-by: Gonglei <arei.gong...@huawei.com>
    Reviewed-by: Markus Armbruster <arm...@redhat.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>
@@ -112,11 +127,14 @@ Marc Marí <marc.mari.barc...@gmail.com>
  Marc Marí <mar...@redhat.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>

I can't find these two in git-log.

$ git log -1 eb83c2030a
commit eb83c2030aa037b4c6037bfa3cbe181343dc6a8b
Author:     Changlong Xie <xiecl.f...@cn.fujitsu.com>
AuthorDate: Mon Jul 25 11:48:00 2016 +0800
Commit:     Michael Tokarev <mjt@gandalf>
CommitDate: Tue Sep 13 18:12:34 2016 +0300

$ git log -1 572992eefa
commit 572992eefa74bfb92c24a28bd268de91a9311b0f
Author:     Alex Williamson <alex.william...@redhat.com>
AuthorDate: Thu Jun 14 12:16:57 2012 -0600
Commit:     Michael S. Tsirkin <mst@robin.(none)>
CommitDate: Mon Jun 18 10:21:12 2012 +0300

  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 +142,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)>

I can't find this one in git-log.

$ git log -1 0d4abda8f7
commit 0d4abda8f7328c8911c1d020bb6961650eaf7801
Author:     Peter Maydell <peter.mayd...@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

    hw/pl011.c: Avoid crash on read when no chr backend present

  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>

It's actually spelled siwei.zhu...@data61.csiro.au in git-log.
Shouldn't matter.

Correct:

$ git shortlog -e 6478dd745d~..6478dd745d
Zhuang, Siwei (Data61, Kensington NSW) <siwei.zhu...@data61.csiro.au> (1):
      hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

$ git shortlog -e 6478dd745d~..6478dd745d
Siwei Zhuang <siwei.zhu...@data61.csiro.au> (1):
      hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()

Thanks for caring checking all entries!

+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 +176,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>



Reply via email to