xref: /qemu/.mailmap (revision a8b5c10c7147ebc992de12fdc3f25a219f5c742f)
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.
19Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
20Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
21Aurelien 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>
25Jocelyn 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>
27Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
28malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
29
30# Corrupted Author fields
31Aaron Larson <alarson@ddci.com> alarson@ddci.com
32Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
33fanwenjie <fanwj@mail.ustc.edu.cn> fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn>
34Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
35Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
36Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
37Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
38Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
39Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
40Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@kiwi.(none)>
41
42# There is also a:
43#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
44# for the cvs2svn initialization commit e63c3dc74bf.
45
46# Next, translate a few commits where mailman rewrote the From: line due
47# 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
60Ed 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>
64Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org>
65Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-trivial@nongnu.org>
66Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org>
67BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org>
68
69# Next, replace old addresses by a more recent one.
70Akihiko 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>
72Aleksandar 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>
75Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
76Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
77Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
78Ani Sinha <anisinha@redhat.com> <ani@anisinha.ca>
79Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
80Brian Cain <brian.cain@oss.qualcomm.com> <bcain@quicinc.com>
81Brian Cain <brian.cain@oss.qualcomm.com> <quic_bcain@quicinc.com>
82Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
83Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com>
84Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
85Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com>
86Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com>
87Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
88Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
89Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
90James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
91Juan Quintela <quintela@trasno.org> <quintela@redhat.com>
92Leif 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>
95Luc 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>
98Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
99Paul Brook <paul@nowt.org> <paul@codesourcery.com>
100Paul 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>
104Philippe 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>
107Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com>
108Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
109Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
110Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@weilnetz.de>
111Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
112Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
113
114# Also list preferred name forms where people have changed their
115# git author config, or had utf8/latin1 encoding issues.
116Aaron Lindsay <aaron@os.amperecomputing.com>
117Aaron Larson <alarson@ddci.com>
118Alexey Gerasimenko <x1917x@gmail.com>
119Alex Chen <alex.chen@huawei.com>
120Alex 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>
140Daniel P. Berrangé <berrange@redhat.com>
141Eduardo Otubo <otubo@redhat.com>
142Erik Smit <erik.lucas.smit@gmail.com>
143Fabrice 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>
150Haibin Zhang <haibinzhang@tencent.com>
151Hailiang Zhang <zhang.zhanghailiang@huawei.com>
152Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
153Hervé Poussineau <hpoussin@reactos.org>
154Hyman Huang <huangy81@chinatelecom.cn>
155Jakub 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>
188Pan Nengyuan <pannengyuan@huawei.com>
189Pavel Dovgaluk <dovgaluk@ispras.ru>
190Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
191Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
192Peter Chubb <peter.chubb@nicta.com.au>
193Peter 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>
199Reimar Döffinger <Reimar.Doeffinger@gmx.de>
200Remy 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>
205Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
206Takashi 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>
224Yu-Chen Lin <npes87184@gmail.com>
225Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
226YunQiang 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>
233