.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 fanwenjie <fanwj@mail.ustc.edu.cn> fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn>
  34 Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
  35 Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
  36 Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
  37 Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
  38 Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
  39
  40 # There is also a:
  41 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
  42 # for the cvs2svn initialization commit e63c3dc74bf.
  43
  44 # Next, translate a few commits where mailman rewrote the From: line due
  45 # to strict SPF and DMARC.  Usually, our build process should be flagging
  46 # commits like these before maintainer merges; if you find the need to add
  47 # a line here, please also report a bug against the part of the build
  48 # process that let the mis-attribution slip through in the first place.
  49 #
  50 # If the mailing list munges your emails, use:
  51 #   git config sendemail.from '"Your Name" <your.email@example.com>'
  52 # the use of "" in that line will differ from the typically unquoted
  53 # 'git config user.name', which in turn is sufficient for 'git send-email'
  54 # to add an extra From: line in the body of your email that takes
  55 # precedence over any munged From: in the mail's headers.
  56 # See https://lists.openembedded.org/g/openembedded-core/message/166515
  57 # and https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg06784.html
  58 Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
  59 Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
  60 Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
  61 Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
  62 Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org>
  63 Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org>
  64 BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org>
  65
  66 # Next, replace old addresses by a more recent one.
  67 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
  68 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
  69 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
  70 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
  71 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
  72 Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
  73 Ani Sinha <anisinha@redhat.com> <ani@anisinha.ca>
  74 Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
  75 Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
  76 Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com>
  77 Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
  78 Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com>
  79 Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com>
  80 Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
  81 Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
  82 Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
  83 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
  84 Juan Quintela <quintela@trasno.org> <quintela@redhat.com>
  85 Leif Lindholm <quic_llindhol@quicinc.com> <leif.lindholm@linaro.org>
  86 Leif Lindholm <quic_llindhol@quicinc.com> <leif@nuviainc.com>
  87 Luc Michel <luc@lmichel.fr> <luc.michel@git.antfield.fr>
  88 Luc Michel <luc@lmichel.fr> <luc.michel@greensocs.com>
  89 Luc Michel <luc@lmichel.fr> <lmichel@kalray.eu>
  90 Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
  91 Paul Brook <paul@nowt.org> <paul@codesourcery.com>
  92 Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
  93 Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
  94 Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
  95 Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
  96 Philippe Mathieu-Daudé <philmd@linaro.org> <f4bug@amsat.org>
  97 Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@redhat.com>
  98 Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com>
  99 Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com>
 100 Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
 101 Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
 102 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
 103
 104 # Also list preferred name forms where people have changed their
 105 # git author config, or had utf8/latin1 encoding issues.
 106 Aaron Lindsay <aaron@os.amperecomputing.com>
 107 Aaron Larson <alarson@ddci.com>
 108 Alexey Gerasimenko <x1917x@gmail.com>
 109 Alex Chen <alex.chen@huawei.com>
 110 Alex Ivanov <void@aleksoft.net>
 111 Andreas Färber <afaerber@suse.de>
 112 Bandan Das <bsd@redhat.com>
 113 Benjamin MARSILI <mlspirat42@gmail.com>
 114 Benoît Canet <benoit.canet@gmail.com>
 115 Benoît Canet <benoit.canet@irqsave.net>
 116 Benoît Canet <benoit.canet@nodalink.com>
 117 Boqun Feng <boqun.feng@gmail.com>
 118 Boqun Feng <boqun.feng@intel.com>
 119 Brad Smith <brad@comstyle.com>
 120 Brijesh Singh <brijesh.singh@amd.com>
 121 Brilly Wu <brillywu@viatech.com.cn>
 122 Cédric Vincent <cedric.vincent@st.com>
 123 CheneyLin <linzc@zju.edu.cn>
 124 Chen Gang <chengang@emindsoft.com.cn>
 125 Chen Gang <gang.chen.5i5j@gmail.com>
 126 Chen Gang <gang.chen@sunrus.com.cn>
 127 Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
 128 Christophe Lyon <christophe.lyon@st.com>
 129 Collin L. Walling <walling@linux.ibm.com>
 130 Daniel P. Berrangé <berrange@redhat.com>
 131 Eduardo Otubo <otubo@redhat.com>
 132 Erik Smit <erik.lucas.smit@gmail.com>
 133 Fabrice Desclaux <fabrice.desclaux@cea.fr>
 134 Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
 135 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
 136 Gautham R. Shenoy <ego@in.ibm.com>
 137 Gautham R. Shenoy <ego@linux.vnet.ibm.com>
 138 Gonglei (Arei) <arei.gonglei@huawei.com>
 139 Guang Wang <wang.guang55@zte.com.cn>
 140 Haibin Zhang <haibinzhang@tencent.com>
 141 Hailiang Zhang <zhang.zhanghailiang@huawei.com>
 142 Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
 143 Hervé Poussineau <hpoussin@reactos.org>
 144 Hyman Huang <huangy81@chinatelecom.cn>
 145 Jakub Jermář <jakub@jermar.eu>
 146 Jakub Jermář <jakub.jermar@kernkonzept.com>
 147 Jean-Christophe Dubois <jcd@tribudubois.net>
 148 Jindřich Makovička <makovick@gmail.com>
 149 John Arbuckle <programmingkidx@gmail.com>
 150 Juha Riihimäki <juha.riihimaki@nokia.com>
 151 Juha Riihimäki <Juha.Riihimaki@nokia.com>
 152 Jun Li <junmuzi@gmail.com>
 153 Laurent Vivier <Laurent@lvivier.info>
 154 Leandro Lupori <leandro.lupori@gmail.com>
 155 Li Guang <lig.fnst@cn.fujitsu.com>
 156 Liming Wang <walimisdev@gmail.com>
 157 linzhecheng <linzc@zju.edu.cn>
 158 Liran Schour <lirans@il.ibm.com>
 159 Liu Yu <yu.liu@freescale.com>
 160 Liu Yu <Yu.Liu@freescale.com>
 161 Li Zhang <zhlcindy@gmail.com>
 162 Li Zhang <zhlcindy@linux.vnet.ibm.com>
 163 Lluís Vilanova <vilanova@ac.upc.edu>
 164 Lluís Vilanova <xscript@gmx.net>
 165 Longpeng (Mike) <longpeng2@huawei.com>
 166 Luc Michel <luc.michel@git.antfield.fr>
 167 Luc Michel <luc.michel@greensocs.com>
 168 Marc Marí <marc.mari.barcelo@gmail.com>
 169 Marc Marí <markmb@redhat.com>
 170 Michael Avdienko <whitearchey@gmail.com>
 171 Michael S. Tsirkin <mst@redhat.com>
 172 Munkyu Im <munkyu.im@samsung.com>
 173 Nicholas Bellinger <nab@linux-iscsi.org>
 174 Nicholas Thomas <nick@bytemark.co.uk>
 175 Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 176 Orit Wasserman <owasserm@redhat.com>
 177 Paolo Bonzini <pbonzini@redhat.com>
 178 Pan Nengyuan <pannengyuan@huawei.com>
 179 Pavel Dovgaluk <dovgaluk@ispras.ru>
 180 Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
 181 Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
 182 Peter Chubb <peter.chubb@nicta.com.au>
 183 Peter Crosthwaite <crosthwaite.peter@gmail.com>
 184 Peter Crosthwaite <peter.crosthwaite@petalogix.com>
 185 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
 186 Prasad J Pandit <pjp@fedoraproject.org>
 187 Prasad J Pandit <ppandit@redhat.com>
 188 Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
 189 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 190 Remy Noel <remy.noel@blade-group.com>
 191 Roger Pau Monné <roger.pau@citrix.com>
 192 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
 193 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
 194 Sochin Jiang <sochin.jiang@huawei.com>
 195 Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
 196 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
 197 Thomas Huth <thuth@redhat.com>
 198 Thomas Knych <thomaswk@google.com>
 199 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
 200 Tony Nguyen <tony.nguyen@bt.com>
 201 Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
 202 Vibi Sreenivasan <vibi_sreenivasan@cms.com>
 203 Vijaya Kumar K <vijayak@cavium.com>
 204 Vijaya Kumar K <Vijaya.Kumar@cavium.com>
 205 Vijay Kumar <vijaykumar@bravegnu.org>
 206 Vijay Kumar <vijaykumar@zilogic.com>
 207 Wang Guang <wang.guang55@zte.com.cn>
 208 Wenchao Xia <xiawenc@linux.vnet.ibm.com>
 209 Wenshuang Ma <kevinnma@tencent.com>
 210 Xiaoqiang Zhao <zxq_yx_007@163.com>
 211 Xinhua Cao <caoxinhua@huawei.com>
 212 Xiong Zhang <xiong.y.zhang@intel.com>
 213 Yin Yin <yin.yin@cs2c.com.cn>
 214 Yu-Chen Lin <npes87184@gmail.com>
 215 Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
 216 YunQiang Su <syq@debian.org>
 217 YunQiang Su <ysu@wavecomp.com>
 218 Yuri Pudgorodskiy <yur@virtuozzo.com>
 219 Zhengui Li <lizhengui@huawei.com>
 220 Zhenwei Pi <pizhenwei@bytedance.com>
 221 Zhenwei Pi <zhenwei.pi@youruncloud.com>
 222 Zhuang Yanying <ann.zhuangyanying@huawei.com>