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