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