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