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