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