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