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