blob: e7271852dc6af293c5e42c822c1376a88bad7ee6 [file] [log] [blame]
Eric Blake3bd26082018-03-26 13:41:47 -05001# This mailmap fixes up author names/addresses.
Alex Bennéef4cf1ed2019-08-28 12:03:23 +01002#
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#
Eric Blake3bd26082018-03-26 13:41:47 -050016
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.
Peter Maydell4cb01652011-12-12 10:58:26 +000019Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguoribc02fb32013-08-19 08:49:37 -050020Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Peter Maydell4cb01652011-12-12 10:58:26 +000021Aurelien 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>
Peter Maydell4cb01652011-12-12 10:58:26 +000025Jocelyn 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>
Peter Maydell4cb01652011-12-12 10:58:26 +000027Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
28malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
Eric Blake3bd26082018-03-26 13:41:47 -050029
Alex Bennée82585a32021-07-21 00:26:40 +010030# Corrupted Author fields
Alex Bennéeb8003f92022-03-11 13:41:53 +000031Aaron Larson <alarson@ddci.com> alarson@ddci.com
32Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
Alex Bennée9163d742023-11-06 18:51:11 +000033fanwenjie <fanwj@mail.ustc.edu.cn> fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn>
Alex Bennéeb8003f92022-03-11 13:41:53 +000034Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
Alex Bennée82585a32021-07-21 00:26:40 +010035Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
Alex Bennéeb8003f92022-03-11 13:41:53 +000036Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
Alex Bennée82585a32021-07-21 00:26:40 +010037Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
Alex Bennée9163d742023-11-06 18:51:11 +000038Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
Philippe Mathieu-Daudé63b4c712024-01-23 09:21:04 +010039Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
40Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@kiwi.(none)>
Alex Bennée82585a32021-07-21 00:26:40 +010041
Peter Maydell4cb01652011-12-12 10:58:26 +000042# There is also a:
43# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
44# for the cvs2svn initialization commit e63c3dc74bf.
Eric Blake3bd26082018-03-26 13:41:47 -050045
46# Next, translate a few commits where mailman rewrote the From: line due
Eric Blake8a18f282023-09-27 09:38:18 -050047# to strict SPF and DMARC. Usually, our build process should be flagging
48# commits like these before maintainer merges; if you find the need to add
49# a line here, please also report a bug against the part of the build
50# process that let the mis-attribution slip through in the first place.
51#
52# If the mailing list munges your emails, use:
53# git config sendemail.from '"Your Name" <your.email@example.com>'
54# the use of "" in that line will differ from the typically unquoted
55# 'git config user.name', which in turn is sufficient for 'git send-email'
56# to add an extra From: line in the body of your email that takes
57# precedence over any munged From: in the mail's headers.
58# See https://lists.openembedded.org/g/openembedded-core/message/166515
59# and https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg06784.html
Eric Blake3bd26082018-03-26 13:41:47 -050060Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
61Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
62Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
63Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
Philippe Mathieu-Daudé5204b492022-12-08 16:55:35 +010064Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org>
Philippe Mathieu-Daudé63b4c712024-01-23 09:21:04 +010065Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-trivial@nongnu.org>
Andrey Drobyshev994679b2023-09-27 09:38:17 -050066Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org>
Eric Blakea960a272023-09-27 09:38:19 -050067BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org>
Eric Blake3bd26082018-03-26 13:41:47 -050068
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +020069# Next, replace old addresses by a more recent one.
Akihiko Odakif37efe52025-05-31 16:00:25 +090070Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> <akihiko.odaki@daynix.com>
71Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> <akihiko.odaki@gmail.com>
Aleksandar Markovic0eac70b2020-03-13 02:00:51 +010072Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
73Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
74Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
Aleksandar Markovic97d89742020-05-18 22:09:16 +020075Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
76Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
Philippe Mathieu-Daudé0f57f8d2020-07-02 19:38:00 +020077Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
Ani Sinha607a0792023-03-20 17:12:33 +053078Ani Sinha <anisinha@redhat.com> <ani@anisinha.ca>
Aleksandar Markovic63640d62019-10-23 12:23:36 +020079Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Brian Cain2dfe9362024-11-23 08:46:40 -080080Brian Cain <brian.cain@oss.qualcomm.com> <bcain@quicinc.com>
81Brian Cain <brian.cain@oss.qualcomm.com> <quic_bcain@quicinc.com>
Christian Borntraeger2c092952021-11-26 11:24:49 +010082Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
Damien Hedde1d7e6722023-02-13 10:53:06 +000083Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com>
Aleksandar Markoviccdcb6392020-06-02 10:52:14 +020084Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
Frederic Konrad034e0502022-04-01 15:35:49 +010085Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com>
86Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com>
Greg Kurz3c9ef9c2020-08-12 17:37:31 +020087Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
Huacai Chendab1e1e2020-12-05 17:22:01 +080088Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
89Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
Aleksandar Markovic63640d62019-10-23 12:23:36 +020090James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Juan Quintelae1c2b0e2024-01-02 21:19:07 +010091Juan Quintela <quintela@trasno.org> <quintela@redhat.com>
Leif Lindholma6240a22024-12-11 15:31:09 +000092Leif Lindholm <leif.lindholm@oss.qualcomm.com> <quic_llindhol@quicinc.com>
93Leif Lindholm <leif.lindholm@oss.qualcomm.com> <leif.lindholm@linaro.org>
94Leif Lindholm <leif.lindholm@oss.qualcomm.com> <leif@nuviainc.com>
Luc Micheldeb1ef92023-09-29 16:03:27 +020095Luc Michel <luc@lmichel.fr> <luc.michel@git.antfield.fr>
96Luc Michel <luc@lmichel.fr> <luc.michel@greensocs.com>
97Luc Michel <luc@lmichel.fr> <lmichel@kalray.eu>
Radoslaw Biernacki428a3772020-05-12 19:07:04 +020098Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
Alex Bennée13b29182022-09-29 12:42:28 +010099Paul Brook <paul@nowt.org> <paul@codesourcery.com>
Philippe Mathieu-Daudé2b107c22020-07-07 04:25:44 +0200100Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
101Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
102Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
103Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
Philippe Mathieu-Daudé8823ef12022-10-17 20:20:05 +0200104Philippe Mathieu-Daudé <philmd@linaro.org> <f4bug@amsat.org>
105Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@redhat.com>
106Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com>
Philippe Mathieu-Daudé3b4a0252023-06-21 13:32:23 +0200107Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com>
Sriram Yagnaraman92360d62024-02-28 09:06:25 +0100108Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
Aleksandar Markovicf364a8d2020-06-02 10:52:15 +0200109Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
Philippe Mathieu-Daudé63b4c712024-01-23 09:21:04 +0100110Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@weilnetz.de>
Taylor Simpson7d196e22023-05-24 09:11:26 -0700111Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
Philippe Mathieu-Daudé3b4a0252023-06-21 13:32:23 +0200112Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
Eric Blake3bd26082018-03-26 13:41:47 -0500113
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000114# Also list preferred name forms where people have changed their
Eric Blaked668c822018-12-07 11:07:33 -0600115# git author config, or had utf8/latin1 encoding issues.
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200116Aaron Lindsay <aaron@os.amperecomputing.com>
Alex Bennéeb8003f92022-03-11 13:41:53 +0000117Aaron Larson <alarson@ddci.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200118Alexey Gerasimenko <x1917x@gmail.com>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200119Alex Chen <alex.chen@huawei.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200120Alex Ivanov <void@aleksoft.net>
121Andreas Färber <afaerber@suse.de>
122Bandan Das <bsd@redhat.com>
123Benjamin MARSILI <mlspirat42@gmail.com>
124Benoît Canet <benoit.canet@gmail.com>
125Benoît Canet <benoit.canet@irqsave.net>
126Benoît Canet <benoit.canet@nodalink.com>
127Boqun Feng <boqun.feng@gmail.com>
128Boqun Feng <boqun.feng@intel.com>
129Brad Smith <brad@comstyle.com>
130Brijesh Singh <brijesh.singh@amd.com>
131Brilly Wu <brillywu@viatech.com.cn>
132Cédric Vincent <cedric.vincent@st.com>
133CheneyLin <linzc@zju.edu.cn>
134Chen Gang <chengang@emindsoft.com.cn>
135Chen Gang <gang.chen.5i5j@gmail.com>
136Chen Gang <gang.chen@sunrus.com.cn>
137Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
138Christophe Lyon <christophe.lyon@st.com>
139Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000140Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200141Eduardo Otubo <otubo@redhat.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +0100142Erik Smit <erik.lucas.smit@gmail.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200143Fabrice Desclaux <fabrice.desclaux@cea.fr>
144Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
145Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
146Gautham R. Shenoy <ego@in.ibm.com>
147Gautham R. Shenoy <ego@linux.vnet.ibm.com>
148Gonglei (Arei) <arei.gonglei@huawei.com>
149Guang Wang <wang.guang55@zte.com.cn>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200150Haibin Zhang <haibinzhang@tencent.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200151Hailiang Zhang <zhang.zhanghailiang@huawei.com>
Hanna Reitzb0c47982021-08-10 16:04:11 +0200152Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200153Hervé Poussineau <hpoussin@reactos.org>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200154Hyman Huang <huangy81@chinatelecom.cn>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200155Jakub Jermář <jakub@jermar.eu>
156Jakub Jermář <jakub.jermar@kernkonzept.com>
157Jean-Christophe Dubois <jcd@tribudubois.net>
158Jindřich Makovička <makovick@gmail.com>
159John Arbuckle <programmingkidx@gmail.com>
160Juha Riihimäki <juha.riihimaki@nokia.com>
161Juha Riihimäki <Juha.Riihimaki@nokia.com>
162Jun Li <junmuzi@gmail.com>
163Laurent Vivier <Laurent@lvivier.info>
164Leandro Lupori <leandro.lupori@gmail.com>
165Li Guang <lig.fnst@cn.fujitsu.com>
166Liming Wang <walimisdev@gmail.com>
167linzhecheng <linzc@zju.edu.cn>
168Liran Schour <lirans@il.ibm.com>
169Liu Yu <yu.liu@freescale.com>
170Liu Yu <Yu.Liu@freescale.com>
171Li Zhang <zhlcindy@gmail.com>
172Li Zhang <zhlcindy@linux.vnet.ibm.com>
173Lluís Vilanova <vilanova@ac.upc.edu>
174Lluís Vilanova <xscript@gmx.net>
175Longpeng (Mike) <longpeng2@huawei.com>
176Luc Michel <luc.michel@git.antfield.fr>
177Luc Michel <luc.michel@greensocs.com>
178Marc Marí <marc.mari.barcelo@gmail.com>
179Marc Marí <markmb@redhat.com>
180Michael Avdienko <whitearchey@gmail.com>
181Michael S. Tsirkin <mst@redhat.com>
182Munkyu Im <munkyu.im@samsung.com>
183Nicholas Bellinger <nab@linux-iscsi.org>
184Nicholas Thomas <nick@bytemark.co.uk>
185Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
186Orit Wasserman <owasserm@redhat.com>
187Paolo Bonzini <pbonzini@redhat.com>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200188Pan Nengyuan <pannengyuan@huawei.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200189Pavel Dovgaluk <dovgaluk@ispras.ru>
190Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
191Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
Alex Bennéeb8003f92022-03-11 13:41:53 +0000192Peter Chubb <peter.chubb@nicta.com.au>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200193Peter Crosthwaite <crosthwaite.peter@gmail.com>
194Peter Crosthwaite <peter.crosthwaite@petalogix.com>
195Peter Crosthwaite <peter.crosthwaite@xilinx.com>
196Prasad J Pandit <pjp@fedoraproject.org>
197Prasad J Pandit <ppandit@redhat.com>
198Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Philippe Mathieu-Daudé957e8b32018-10-11 00:29:43 +0200199Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200200Remy Noel <remy.noel@blade-group.com>
201Roger Pau Monné <roger.pau@citrix.com>
202Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
203Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
204Sochin Jiang <sochin.jiang@huawei.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +0100205Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200206Takashi Yoshii <takasi-y@ops.dti.ne.jp>
207Thomas Huth <thuth@redhat.com>
208Thomas Knych <thomaswk@google.com>
209Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
210Tony Nguyen <tony.nguyen@bt.com>
211Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
212Vibi Sreenivasan <vibi_sreenivasan@cms.com>
213Vijaya Kumar K <vijayak@cavium.com>
214Vijaya Kumar K <Vijaya.Kumar@cavium.com>
215Vijay Kumar <vijaykumar@bravegnu.org>
216Vijay Kumar <vijaykumar@zilogic.com>
217Wang Guang <wang.guang55@zte.com.cn>
218Wenchao Xia <xiawenc@linux.vnet.ibm.com>
219Wenshuang Ma <kevinnma@tencent.com>
220Xiaoqiang Zhao <zxq_yx_007@163.com>
221Xinhua Cao <caoxinhua@huawei.com>
222Xiong Zhang <xiong.y.zhang@intel.com>
223Yin Yin <yin.yin@cs2c.com.cn>
Yu-Chen Lin4065bb22020-02-06 20:55:04 +0800224Yu-Chen Lin <npes87184@gmail.com>
225Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200226YunQiang Su <syq@debian.org>
227YunQiang Su <ysu@wavecomp.com>
228Yuri Pudgorodskiy <yur@virtuozzo.com>
229Zhengui Li <lizhengui@huawei.com>
230Zhenwei Pi <pizhenwei@bytedance.com>
231Zhenwei Pi <zhenwei.pi@youruncloud.com>
232Zhuang Yanying <ann.zhuangyanying@huawei.com>