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