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