.mailmap

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