qemu/.mailmap
<<
>>
Prefs
   1# This mailmap fixes up author names/addresses.
   2#
   3# If you are adding to this file consider if a similar change needs to
   4# be made to contrib/gitdm/aliases. They are not however completely
   5# analogous. .mailmap is concerned with fixing up damaged author
   6# fields where as the gitdm equivalent is more concerned with making
   7# sure multiple email addresses get mapped onto the same author.
   8#
   9# From man git-shortlog the forms are:
  10#
  11#  Proper Name <commit@email.xx>
  12#  <proper@email.xx> <commit@email.xx>
  13#  Proper Name <proper@email.xx> <commit@email.xx>
  14#  Proper Name <proper@email.xx> Commit Name <commit@email.xx>
  15#
  16
  17# The first section translates weird addresses from the original git import
  18# into proper addresses so that they are counted properly by git shortlog.
  19Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
  20Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
  21Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
  22Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
  23Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
  24Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
  25Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
  26Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
  27Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
  28malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
  29
  30# Corrupted Author fields
  31Aaron Larson <alarson@ddci.com> alarson@ddci.com
  32Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
  33Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
  34Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
  35Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
  36Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
  37
  38# There is also a:
  39#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
  40# for the cvs2svn initialization commit e63c3dc74bf.
  41
  42# Next, translate a few commits where mailman rewrote the From: line due
  43# to strict SPF, although we prefer to avoid adding more entries like that.
  44Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
  45Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
  46Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
  47Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
  48
  49# Next, replace old addresses by a more recent one.
  50Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
  51Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
  52Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
  53Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
  54Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
  55Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
  56Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
  57Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
  58Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
  59Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com>
  60Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com>
  61Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
  62Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
  63Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
  64James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
  65Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
  66Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
  67Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
  68Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
  69Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
  70Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
  71Philippe Mathieu-Daudé <f4bug@amsat.org> <philmd@redhat.com>
  72Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
  73Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
  74
  75# Also list preferred name forms where people have changed their
  76# git author config, or had utf8/latin1 encoding issues.
  77Aaron Lindsay <aaron@os.amperecomputing.com>
  78Aaron Larson <alarson@ddci.com>
  79Alexey Gerasimenko <x1917x@gmail.com>
  80Alex Chen <alex.chen@huawei.com>
  81Alex Ivanov <void@aleksoft.net>
  82Andreas Färber <afaerber@suse.de>
  83Bandan Das <bsd@redhat.com>
  84Benjamin MARSILI <mlspirat42@gmail.com>
  85Benoît Canet <benoit.canet@gmail.com>
  86Benoît Canet <benoit.canet@irqsave.net>
  87Benoît Canet <benoit.canet@nodalink.com>
  88Boqun Feng <boqun.feng@gmail.com>
  89Boqun Feng <boqun.feng@intel.com>
  90Brad Smith <brad@comstyle.com>
  91Brijesh Singh <brijesh.singh@amd.com>
  92Brilly Wu <brillywu@viatech.com.cn>
  93Cédric Vincent <cedric.vincent@st.com>
  94CheneyLin <linzc@zju.edu.cn>
  95Chen Gang <chengang@emindsoft.com.cn>
  96Chen Gang <gang.chen.5i5j@gmail.com>
  97Chen Gang <gang.chen@sunrus.com.cn>
  98Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
  99Christophe Lyon <christophe.lyon@st.com>
 100Collin L. Walling <walling@linux.ibm.com>
 101Daniel P. Berrangé <berrange@redhat.com>
 102Eduardo Otubo <otubo@redhat.com>
 103Erik Smit <erik.lucas.smit@gmail.com>
 104Fabrice Desclaux <fabrice.desclaux@cea.fr>
 105Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
 106Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
 107Gautham R. Shenoy <ego@in.ibm.com>
 108Gautham R. Shenoy <ego@linux.vnet.ibm.com>
 109Gonglei (Arei) <arei.gonglei@huawei.com>
 110Guang Wang <wang.guang55@zte.com.cn>
 111Haibin Zhang <haibinzhang@tencent.com>
 112Hailiang Zhang <zhang.zhanghailiang@huawei.com>
 113Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
 114Hervé Poussineau <hpoussin@reactos.org>
 115Hyman Huang <huangy81@chinatelecom.cn>
 116Jakub Jermář <jakub@jermar.eu>
 117Jakub Jermář <jakub.jermar@kernkonzept.com>
 118Jean-Christophe Dubois <jcd@tribudubois.net>
 119Jindřich Makovička <makovick@gmail.com>
 120John Arbuckle <programmingkidx@gmail.com>
 121Juha Riihimäki <juha.riihimaki@nokia.com>
 122Juha Riihimäki <Juha.Riihimaki@nokia.com>
 123Jun Li <junmuzi@gmail.com>
 124Laurent Vivier <Laurent@lvivier.info>
 125Leandro Lupori <leandro.lupori@gmail.com>
 126Li Guang <lig.fnst@cn.fujitsu.com>
 127Liming Wang <walimisdev@gmail.com>
 128linzhecheng <linzc@zju.edu.cn>
 129Liran Schour <lirans@il.ibm.com>
 130Liu Yu <yu.liu@freescale.com>
 131Liu Yu <Yu.Liu@freescale.com>
 132Li Zhang <zhlcindy@gmail.com>
 133Li Zhang <zhlcindy@linux.vnet.ibm.com>
 134Lluís Vilanova <vilanova@ac.upc.edu>
 135Lluís Vilanova <xscript@gmx.net>
 136Longpeng (Mike) <longpeng2@huawei.com>
 137Luc Michel <luc.michel@git.antfield.fr>
 138Luc Michel <luc.michel@greensocs.com>
 139Marc Marí <marc.mari.barcelo@gmail.com>
 140Marc Marí <markmb@redhat.com>
 141Michael Avdienko <whitearchey@gmail.com>
 142Michael S. Tsirkin <mst@redhat.com>
 143Munkyu Im <munkyu.im@samsung.com>
 144Nicholas Bellinger <nab@linux-iscsi.org>
 145Nicholas Thomas <nick@bytemark.co.uk>
 146Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 147Orit Wasserman <owasserm@redhat.com>
 148Paolo Bonzini <pbonzini@redhat.com>
 149Pan Nengyuan <pannengyuan@huawei.com>
 150Pavel Dovgaluk <dovgaluk@ispras.ru>
 151Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
 152Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
 153Peter Chubb <peter.chubb@nicta.com.au>
 154Peter Crosthwaite <crosthwaite.peter@gmail.com>
 155Peter Crosthwaite <peter.crosthwaite@petalogix.com>
 156Peter Crosthwaite <peter.crosthwaite@xilinx.com>
 157Prasad J Pandit <pjp@fedoraproject.org>
 158Prasad J Pandit <ppandit@redhat.com>
 159Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 160Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 161Remy Noel <remy.noel@blade-group.com>
 162Roger Pau Monné <roger.pau@citrix.com>
 163Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 164Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 165Sochin Jiang <sochin.jiang@huawei.com>
 166Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
 167Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 168Thomas Huth <thuth@redhat.com>
 169Thomas Knych <thomaswk@google.com>
 170Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
 171Tony Nguyen <tony.nguyen@bt.com>
 172Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
 173Vibi Sreenivasan <vibi_sreenivasan@cms.com>
 174Vijaya Kumar K <vijayak@cavium.com>
 175Vijaya Kumar K <Vijaya.Kumar@cavium.com>
 176Vijay Kumar <vijaykumar@bravegnu.org>
 177Vijay Kumar <vijaykumar@zilogic.com>
 178Wang Guang <wang.guang55@zte.com.cn>
 179Wenchao Xia <xiawenc@linux.vnet.ibm.com>
 180Wenshuang Ma <kevinnma@tencent.com>
 181Xiaoqiang Zhao <zxq_yx_007@163.com>
 182Xinhua Cao <caoxinhua@huawei.com>
 183Xiong Zhang <xiong.y.zhang@intel.com>
 184Yin Yin <yin.yin@cs2c.com.cn>
 185Yu-Chen Lin <npes87184@gmail.com>
 186Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
 187YunQiang Su <syq@debian.org>
 188YunQiang Su <ysu@wavecomp.com>
 189Yuri Pudgorodskiy <yur@virtuozzo.com>
 190Zhengui Li <lizhengui@huawei.com>
 191Zhenwei Pi <pizhenwei@bytedance.com>
 192Zhenwei Pi <zhenwei.pi@youruncloud.com>
 193Zhuang Yanying <ann.zhuangyanying@huawei.com>
 194