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