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