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# There is also a:
  31#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
  32# for the cvs2svn initialization commit e63c3dc74bf.
  33
  34# Next, translate a few commits where mailman rewrote the From: line due
  35# to strict SPF, although we prefer to avoid adding more entries like that.
  36Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
  37Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
  38Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
  39Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
  40
  41# Next, replace old addresses by a more recent one.
  42Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
  43Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
  44Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
  45Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
  46Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
  47Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
  48Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
  49Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
  50Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
  51Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
  52James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
  53Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
  54Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
  55Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
  56Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
  57Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
  58Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
  59Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
  60Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
  61
  62# Also list preferred name forms where people have changed their
  63# git author config, or had utf8/latin1 encoding issues.
  64Aaron Lindsay <aaron@os.amperecomputing.com>
  65Alexey Gerasimenko <x1917x@gmail.com>
  66Alex Ivanov <void@aleksoft.net>
  67Andreas Färber <afaerber@suse.de>
  68Bandan Das <bsd@redhat.com>
  69Benjamin MARSILI <mlspirat42@gmail.com>
  70Benoît Canet <benoit.canet@gmail.com>
  71Benoît Canet <benoit.canet@irqsave.net>
  72Benoît Canet <benoit.canet@nodalink.com>
  73Boqun Feng <boqun.feng@gmail.com>
  74Boqun Feng <boqun.feng@intel.com>
  75Brad Smith <brad@comstyle.com>
  76Brijesh Singh <brijesh.singh@amd.com>
  77Brilly Wu <brillywu@viatech.com.cn>
  78Cédric Vincent <cedric.vincent@st.com>
  79CheneyLin <linzc@zju.edu.cn>
  80Chen Gang <chengang@emindsoft.com.cn>
  81Chen Gang <gang.chen.5i5j@gmail.com>
  82Chen Gang <gang.chen@sunrus.com.cn>
  83Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
  84Christophe Lyon <christophe.lyon@st.com>
  85Collin L. Walling <walling@linux.ibm.com>
  86Daniel P. Berrangé <berrange@redhat.com>
  87Eduardo Otubo <otubo@redhat.com>
  88Erik Smit <erik.lucas.smit@gmail.com>
  89Fabrice Desclaux <fabrice.desclaux@cea.fr>
  90Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
  91Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
  92Gautham R. Shenoy <ego@in.ibm.com>
  93Gautham R. Shenoy <ego@linux.vnet.ibm.com>
  94Gonglei (Arei) <arei.gonglei@huawei.com>
  95Guang Wang <wang.guang55@zte.com.cn>
  96Hailiang Zhang <zhang.zhanghailiang@huawei.com>
  97Hervé Poussineau <hpoussin@reactos.org>
  98Jakub Jermář <jakub@jermar.eu>
  99Jakub Jermář <jakub.jermar@kernkonzept.com>
 100Jean-Christophe Dubois <jcd@tribudubois.net>
 101Jindřich Makovička <makovick@gmail.com>
 102John Arbuckle <programmingkidx@gmail.com>
 103Juha Riihimäki <juha.riihimaki@nokia.com>
 104Juha Riihimäki <Juha.Riihimaki@nokia.com>
 105Jun Li <junmuzi@gmail.com>
 106Laurent Vivier <Laurent@lvivier.info>
 107Leandro Lupori <leandro.lupori@gmail.com>
 108Li Guang <lig.fnst@cn.fujitsu.com>
 109Liming Wang <walimisdev@gmail.com>
 110linzhecheng <linzc@zju.edu.cn>
 111Liran Schour <lirans@il.ibm.com>
 112Liu Yu <yu.liu@freescale.com>
 113Liu Yu <Yu.Liu@freescale.com>
 114Li Zhang <zhlcindy@gmail.com>
 115Li Zhang <zhlcindy@linux.vnet.ibm.com>
 116Lluís Vilanova <vilanova@ac.upc.edu>
 117Lluís Vilanova <xscript@gmx.net>
 118Longpeng (Mike) <longpeng2@huawei.com>
 119Luc Michel <luc.michel@git.antfield.fr>
 120Luc Michel <luc.michel@greensocs.com>
 121Marc Marí <marc.mari.barcelo@gmail.com>
 122Marc Marí <markmb@redhat.com>
 123Michael Avdienko <whitearchey@gmail.com>
 124Michael S. Tsirkin <mst@redhat.com>
 125Munkyu Im <munkyu.im@samsung.com>
 126Nicholas Bellinger <nab@linux-iscsi.org>
 127Nicholas Thomas <nick@bytemark.co.uk>
 128Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 129Orit Wasserman <owasserm@redhat.com>
 130Paolo Bonzini <pbonzini@redhat.com>
 131Pavel Dovgaluk <dovgaluk@ispras.ru>
 132Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
 133Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
 134Peter Crosthwaite <crosthwaite.peter@gmail.com>
 135Peter Crosthwaite <peter.crosthwaite@petalogix.com>
 136Peter Crosthwaite <peter.crosthwaite@xilinx.com>
 137Prasad J Pandit <pjp@fedoraproject.org>
 138Prasad J Pandit <ppandit@redhat.com>
 139Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 140Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 141Remy Noel <remy.noel@blade-group.com>
 142Roger Pau Monné <roger.pau@citrix.com>
 143Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 144Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 145Sochin Jiang <sochin.jiang@huawei.com>
 146Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
 147Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 148Thomas Huth <thuth@redhat.com>
 149Thomas Knych <thomaswk@google.com>
 150Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
 151Tony Nguyen <tony.nguyen@bt.com>
 152Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
 153Vibi Sreenivasan <vibi_sreenivasan@cms.com>
 154Vijaya Kumar K <vijayak@cavium.com>
 155Vijaya Kumar K <Vijaya.Kumar@cavium.com>
 156Vijay Kumar <vijaykumar@bravegnu.org>
 157Vijay Kumar <vijaykumar@zilogic.com>
 158Wang Guang <wang.guang55@zte.com.cn>
 159Wenchao Xia <xiawenc@linux.vnet.ibm.com>
 160Wenshuang Ma <kevinnma@tencent.com>
 161Xiaoqiang Zhao <zxq_yx_007@163.com>
 162Xinhua Cao <caoxinhua@huawei.com>
 163Xiong Zhang <xiong.y.zhang@intel.com>
 164Yin Yin <yin.yin@cs2c.com.cn>
 165Yu-Chen Lin <npes87184@gmail.com>
 166Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
 167YunQiang Su <syq@debian.org>
 168YunQiang Su <ysu@wavecomp.com>
 169Yuri Pudgorodskiy <yur@virtuozzo.com>
 170Zhengui Li <lizhengui@huawei.com>
 171Zhenwei Pi <pizhenwei@bytedance.com>
 172Zhenwei Pi <zhenwei.pi@youruncloud.com>
 173Zhuang Yanying <ann.zhuangyanying@huawei.com>
 174