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 # Corrupted Author fields 31 Aaron Larson <alarson@ddci.com> alarson@ddci.com 32 Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber> 33 fanwenjie <fanwj@mail.ustc.edu.cn> fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn> 34 Jason Wang <jasowang@redhat.com> Jason Wang <jasowang> 35 Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com> 36 Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org> 37 Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com> 38 Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com> 39 40 # There is also a: 41 # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> 42 # for the cvs2svn initialization commit e63c3dc74bf. 43 44 # Next, translate a few commits where mailman rewrote the From: line due 45 # to strict SPF and DMARC. Usually, our build process should be flagging 46 # commits like these before maintainer merges; if you find the need to add 47 # a line here, please also report a bug against the part of the build 48 # process that let the mis-attribution slip through in the first place. 49 # 50 # If the mailing list munges your emails, use: 51 # git config sendemail.from '"Your Name" <your.email@example.com>' 52 # the use of "" in that line will differ from the typically unquoted 53 # 'git config user.name', which in turn is sufficient for 'git send-email' 54 # to add an extra From: line in the body of your email that takes 55 # precedence over any munged From: in the mail's headers. 56 # See https://lists.openembedded.org/g/openembedded-core/message/166515 57 # and https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg06784.html 58 Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org> 59 Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org> 60 Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org> 61 Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> 62 Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org> 63 Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org> 64 BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org> 65 66 # Next, replace old addresses by a more recent one. 67 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com> 68 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com> 69 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com> 70 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com> 71 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com> 72 Alexander Graf <agraf@csgraf.de> <agraf@suse.de> 73 Ani Sinha <anisinha@redhat.com> <ani@anisinha.ca> 74 Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> 75 Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com> 76 Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com> 77 Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com> 78 Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com> 79 Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com> 80 Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com> 81 Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com> 82 Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn> 83 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> 84 Leif Lindholm <quic_llindhol@quicinc.com> <leif.lindholm@linaro.org> 85 Leif Lindholm <quic_llindhol@quicinc.com> <leif@nuviainc.com> 86 Luc Michel <luc@lmichel.fr> <luc.michel@git.antfield.fr> 87 Luc Michel <luc@lmichel.fr> <luc.michel@greensocs.com> 88 Luc Michel <luc@lmichel.fr> <lmichel@kalray.eu> 89 Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org> 90 Paul Brook <paul@nowt.org> <paul@codesourcery.com> 91 Paul Burton <paulburton@kernel.org> <paul.burton@mips.com> 92 Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com> 93 Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org> 94 Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com> 95 Philippe Mathieu-Daudé <philmd@linaro.org> <f4bug@amsat.org> 96 Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@redhat.com> 97 Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com> 98 Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com> 99 Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com> 100 Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com> 101 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> 102 103 # Also list preferred name forms where people have changed their 104 # git author config, or had utf8/latin1 encoding issues. 105 Aaron Lindsay <aaron@os.amperecomputing.com> 106 Aaron Larson <alarson@ddci.com> 107 Alexey Gerasimenko <x1917x@gmail.com> 108 Alex Chen <alex.chen@huawei.com> 109 Alex Ivanov <void@aleksoft.net> 110 Andreas Färber <afaerber@suse.de> 111 Bandan Das <bsd@redhat.com> 112 Benjamin MARSILI <mlspirat42@gmail.com> 113 Benoît Canet <benoit.canet@gmail.com> 114 Benoît Canet <benoit.canet@irqsave.net> 115 Benoît Canet <benoit.canet@nodalink.com> 116 Boqun Feng <boqun.feng@gmail.com> 117 Boqun Feng <boqun.feng@intel.com> 118 Brad Smith <brad@comstyle.com> 119 Brijesh Singh <brijesh.singh@amd.com> 120 Brilly Wu <brillywu@viatech.com.cn> 121 Cédric Vincent <cedric.vincent@st.com> 122 CheneyLin <linzc@zju.edu.cn> 123 Chen Gang <chengang@emindsoft.com.cn> 124 Chen Gang <gang.chen.5i5j@gmail.com> 125 Chen Gang <gang.chen@sunrus.com.cn> 126 Chen Wei-Ren <chenwj@iis.sinica.edu.tw> 127 Christophe Lyon <christophe.lyon@st.com> 128 Collin L. Walling <walling@linux.ibm.com> 129 Daniel P. Berrangé <berrange@redhat.com> 130 Eduardo Otubo <otubo@redhat.com> 131 Erik Smit <erik.lucas.smit@gmail.com> 132 Fabrice Desclaux <fabrice.desclaux@cea.fr> 133 Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp> 134 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp> 135 Gautham R. Shenoy <ego@in.ibm.com> 136 Gautham R. Shenoy <ego@linux.vnet.ibm.com> 137 Gonglei (Arei) <arei.gonglei@huawei.com> 138 Guang Wang <wang.guang55@zte.com.cn> 139 Haibin Zhang <haibinzhang@tencent.com> 140 Hailiang Zhang <zhang.zhanghailiang@huawei.com> 141 Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com> 142 Hervé Poussineau <hpoussin@reactos.org> 143 Hyman Huang <huangy81@chinatelecom.cn> 144 Jakub Jermář <jakub@jermar.eu> 145 Jakub Jermář <jakub.jermar@kernkonzept.com> 146 Jean-Christophe Dubois <jcd@tribudubois.net> 147 Jindřich Makovička <makovick@gmail.com> 148 John Arbuckle <programmingkidx@gmail.com> 149 Juha Riihimäki <juha.riihimaki@nokia.com> 150 Juha Riihimäki <Juha.Riihimaki@nokia.com> 151 Jun Li <junmuzi@gmail.com> 152 Laurent Vivier <Laurent@lvivier.info> 153 Leandro Lupori <leandro.lupori@gmail.com> 154 Li Guang <lig.fnst@cn.fujitsu.com> 155 Liming Wang <walimisdev@gmail.com> 156 linzhecheng <linzc@zju.edu.cn> 157 Liran Schour <lirans@il.ibm.com> 158 Liu Yu <yu.liu@freescale.com> 159 Liu Yu <Yu.Liu@freescale.com> 160 Li Zhang <zhlcindy@gmail.com> 161 Li Zhang <zhlcindy@linux.vnet.ibm.com> 162 Lluís Vilanova <vilanova@ac.upc.edu> 163 Lluís Vilanova <xscript@gmx.net> 164 Longpeng (Mike) <longpeng2@huawei.com> 165 Luc Michel <luc.michel@git.antfield.fr> 166 Luc Michel <luc.michel@greensocs.com> 167 Marc Marí <marc.mari.barcelo@gmail.com> 168 Marc Marí <markmb@redhat.com> 169 Michael Avdienko <whitearchey@gmail.com> 170 Michael S. Tsirkin <mst@redhat.com> 171 Munkyu Im <munkyu.im@samsung.com> 172 Nicholas Bellinger <nab@linux-iscsi.org> 173 Nicholas Thomas <nick@bytemark.co.uk> 174 Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> 175 Orit Wasserman <owasserm@redhat.com> 176 Paolo Bonzini <pbonzini@redhat.com> 177 Pan Nengyuan <pannengyuan@huawei.com> 178 Pavel Dovgaluk <dovgaluk@ispras.ru> 179 Pavel Dovgaluk <pavel.dovgaluk@gmail.com> 180 Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru> 181 Peter Chubb <peter.chubb@nicta.com.au> 182 Peter Crosthwaite <crosthwaite.peter@gmail.com> 183 Peter Crosthwaite <peter.crosthwaite@petalogix.com> 184 Peter Crosthwaite <peter.crosthwaite@xilinx.com> 185 Prasad J Pandit <pjp@fedoraproject.org> 186 Prasad J Pandit <ppandit@redhat.com> 187 Qiao Nuohan <qiaonuohan@cn.fujitsu.com> 188 Reimar Döffinger <Reimar.Doeffinger@gmx.de> 189 Remy Noel <remy.noel@blade-group.com> 190 Roger Pau Monné <roger.pau@citrix.com> 191 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp> 192 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> 193 Sochin Jiang <sochin.jiang@huawei.com> 194 Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com> 195 Takashi Yoshii <takasi-y@ops.dti.ne.jp> 196 Thomas Huth <thuth@redhat.com> 197 Thomas Knych <thomaswk@google.com> 198 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk> 199 Tony Nguyen <tony.nguyen@bt.com> 200 Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> 201 Vibi Sreenivasan <vibi_sreenivasan@cms.com> 202 Vijaya Kumar K <vijayak@cavium.com> 203 Vijaya Kumar K <Vijaya.Kumar@cavium.com> 204 Vijay Kumar <vijaykumar@bravegnu.org> 205 Vijay Kumar <vijaykumar@zilogic.com> 206 Wang Guang <wang.guang55@zte.com.cn> 207 Wenchao Xia <xiawenc@linux.vnet.ibm.com> 208 Wenshuang Ma <kevinnma@tencent.com> 209 Xiaoqiang Zhao <zxq_yx_007@163.com> 210 Xinhua Cao <caoxinhua@huawei.com> 211 Xiong Zhang <xiong.y.zhang@intel.com> 212 Yin Yin <yin.yin@cs2c.com.cn> 213 Yu-Chen Lin <npes87184@gmail.com> 214 Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com> 215 YunQiang Su <syq@debian.org> 216 YunQiang Su <ysu@wavecomp.com> 217 Yuri Pudgorodskiy <yur@virtuozzo.com> 218 Zhengui Li <lizhengui@huawei.com> 219 Zhenwei Pi <pizhenwei@bytedance.com> 220 Zhenwei Pi <zhenwei.pi@youruncloud.com> 221 Zhuang Yanying <ann.zhuangyanying@huawei.com> 222