Google Git
Sign in
qemu / qemu / fd658a7b8cf1091ae2914655add4511865d7edc0 / . / .mailmap
blob: 64ef9f4de6f58c4591357f8f0abb4af401be21dd [file] [log] [blame]
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]1# This mailmap fixes up author names/addresses.
Alex Bennéef4cf1ed2019-08-28 12:03:23 +0100[diff] [blame]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#
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]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.
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]19Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguoribc02fb32013-08-19 08:49:37 -0500[diff] [blame]20Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]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>
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]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>
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]27Thiemo 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 -0500[diff] [blame]29
Alex Bennée82585a32021-07-21 00:26:40 +0100[diff] [blame]30# Corrupted Author fields
Alex Bennéeb8003f92022-03-11 13:41:53 +0000[diff] [blame]31Aaron Larson <alarson@ddci.com> alarson@ddci.com
32Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
33Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
Alex Bennée82585a32021-07-21 00:26:40 +0100[diff] [blame]34Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
Alex Bennéeb8003f92022-03-11 13:41:53 +0000[diff] [blame]35Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
Alex Bennée82585a32021-07-21 00:26:40 +0100[diff] [blame]36Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
37
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]38# There is also a:
39# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
40# for the cvs2svn initialization commit e63c3dc74bf.
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]41
42# Next, translate a few commits where mailman rewrote the From: line due
43# to strict SPF, although we prefer to avoid adding more entries like that.
44Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
45Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
46Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
47Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
Philippe Mathieu-Daudé5204b492022-12-08 16:55:35 +0100[diff] [blame]48Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org>
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]49
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +0200[diff] [blame]50# Next, replace old addresses by a more recent one.
Aleksandar Markovic0eac70b2020-03-13 02:00:51 +0100[diff] [blame]51Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
52Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
53Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
Aleksandar Markovic97d89742020-05-18 22:09:16 +0200[diff] [blame]54Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
55Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
Philippe Mathieu-Daudé0f57f8d2020-07-02 19:38:00 +0200[diff] [blame]56Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
Ani Sinha607a0792023-03-20 17:12:33 +0530[diff] [blame]57Ani Sinha <anisinha@redhat.com> <ani@anisinha.ca>
Aleksandar Markovic63640d62019-10-23 12:23:36 +0200[diff] [blame]58Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Christian Borntraeger2c092952021-11-26 11:24:49 +0100[diff] [blame]59Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
Damien Hedde1d7e6722023-02-13 10:53:06 +0000[diff] [blame]60Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com>
Aleksandar Markoviccdcb6392020-06-02 10:52:14 +0200[diff] [blame]61Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
Frederic Konrad034e0502022-04-01 15:35:49 +0100[diff] [blame]62Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com>
63Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com>
Greg Kurz3c9ef9c2020-08-12 17:37:31 +0200[diff] [blame]64Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
Huacai Chendab1e1e2020-12-05 17:22:01 +0800[diff] [blame]65Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
66Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
Aleksandar Markovic63640d62019-10-23 12:23:36 +0200[diff] [blame]67James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Leif Lindholm14d5add2022-05-05 12:37:40 +0100[diff] [blame]68Leif Lindholm <quic_llindhol@quicinc.com> <leif.lindholm@linaro.org>
69Leif Lindholm <quic_llindhol@quicinc.com> <leif@nuviainc.com>
Radoslaw Biernacki428a3772020-05-12 19:07:04 +0200[diff] [blame]70Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
Alex Bennée13b29182022-09-29 12:42:28 +0100[diff] [blame]71Paul Brook <paul@nowt.org> <paul@codesourcery.com>
Philippe Mathieu-Daudé2b107c22020-07-07 04:25:44 +0200[diff] [blame]72Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
73Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
74Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
75Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
Philippe Mathieu-Daudé8823ef12022-10-17 20:20:05 +0200[diff] [blame]76Philippe Mathieu-Daudé <philmd@linaro.org> <f4bug@amsat.org>
77Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@redhat.com>
78Philippe Mathieu-Daudé <philmd@linaro.org> <philmd@fungible.com>
Philippe Mathieu-Daudé3b4a0252023-06-21 13:32:23 +0200[diff] [blame]79Roman Bolshakov <rbolshakov@ddn.com> <r.bolshakov@yadro.com>
Aleksandar Markovicf364a8d2020-06-02 10:52:15 +0200[diff] [blame]80Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
Taylor Simpson7d196e22023-05-24 09:11:26 -0700[diff] [blame]81Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
Philippe Mathieu-Daudé3b4a0252023-06-21 13:32:23 +0200[diff] [blame]82Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]83
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000[diff] [blame]84# Also list preferred name forms where people have changed their
Eric Blaked668c822018-12-07 11:07:33 -0600[diff] [blame]85# git author config, or had utf8/latin1 encoding issues.
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]86Aaron Lindsay <aaron@os.amperecomputing.com>
Alex Bennéeb8003f92022-03-11 13:41:53 +0000[diff] [blame]87Aaron Larson <alarson@ddci.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]88Alexey Gerasimenko <x1917x@gmail.com>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200[diff] [blame]89Alex Chen <alex.chen@huawei.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]90Alex Ivanov <void@aleksoft.net>
91Andreas Färber <afaerber@suse.de>
92Bandan Das <bsd@redhat.com>
93Benjamin MARSILI <mlspirat42@gmail.com>
94Benoît Canet <benoit.canet@gmail.com>
95Benoît Canet <benoit.canet@irqsave.net>
96Benoît Canet <benoit.canet@nodalink.com>
97Boqun Feng <boqun.feng@gmail.com>
98Boqun Feng <boqun.feng@intel.com>
99Brad Smith <brad@comstyle.com>
100Brijesh Singh <brijesh.singh@amd.com>
101Brilly Wu <brillywu@viatech.com.cn>
102Cédric Vincent <cedric.vincent@st.com>
103CheneyLin <linzc@zju.edu.cn>
104Chen Gang <chengang@emindsoft.com.cn>
105Chen Gang <gang.chen.5i5j@gmail.com>
106Chen Gang <gang.chen@sunrus.com.cn>
107Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
108Christophe Lyon <christophe.lyon@st.com>
109Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000[diff] [blame]110Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]111Eduardo Otubo <otubo@redhat.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +0100[diff] [blame]112Erik Smit <erik.lucas.smit@gmail.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]113Fabrice Desclaux <fabrice.desclaux@cea.fr>
114Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
115Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
116Gautham R. Shenoy <ego@in.ibm.com>
117Gautham R. Shenoy <ego@linux.vnet.ibm.com>
118Gonglei (Arei) <arei.gonglei@huawei.com>
119Guang Wang <wang.guang55@zte.com.cn>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200[diff] [blame]120Haibin Zhang <haibinzhang@tencent.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]121Hailiang Zhang <zhang.zhanghailiang@huawei.com>
Hanna Reitzb0c47982021-08-10 16:04:11 +0200[diff] [blame]122Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]123Hervé Poussineau <hpoussin@reactos.org>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200[diff] [blame]124Hyman Huang <huangy81@chinatelecom.cn>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]125Jakub Jermář <jakub@jermar.eu>
126Jakub Jermář <jakub.jermar@kernkonzept.com>
127Jean-Christophe Dubois <jcd@tribudubois.net>
128Jindřich Makovička <makovick@gmail.com>
129John Arbuckle <programmingkidx@gmail.com>
130Juha Riihimäki <juha.riihimaki@nokia.com>
131Juha Riihimäki <Juha.Riihimaki@nokia.com>
132Jun Li <junmuzi@gmail.com>
133Laurent Vivier <Laurent@lvivier.info>
134Leandro Lupori <leandro.lupori@gmail.com>
135Li Guang <lig.fnst@cn.fujitsu.com>
136Liming Wang <walimisdev@gmail.com>
137linzhecheng <linzc@zju.edu.cn>
138Liran Schour <lirans@il.ibm.com>
139Liu Yu <yu.liu@freescale.com>
140Liu Yu <Yu.Liu@freescale.com>
141Li Zhang <zhlcindy@gmail.com>
142Li Zhang <zhlcindy@linux.vnet.ibm.com>
143Lluís Vilanova <vilanova@ac.upc.edu>
144Lluís Vilanova <xscript@gmx.net>
145Longpeng (Mike) <longpeng2@huawei.com>
146Luc Michel <luc.michel@git.antfield.fr>
147Luc Michel <luc.michel@greensocs.com>
148Marc Marí <marc.mari.barcelo@gmail.com>
149Marc Marí <markmb@redhat.com>
150Michael Avdienko <whitearchey@gmail.com>
151Michael S. Tsirkin <mst@redhat.com>
152Munkyu Im <munkyu.im@samsung.com>
153Nicholas Bellinger <nab@linux-iscsi.org>
154Nicholas Thomas <nick@bytemark.co.uk>
155Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
156Orit Wasserman <owasserm@redhat.com>
157Paolo Bonzini <pbonzini@redhat.com>
Philippe Mathieu-Daudé63a0eb62021-10-27 06:32:54 +0200[diff] [blame]158Pan Nengyuan <pannengyuan@huawei.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]159Pavel Dovgaluk <dovgaluk@ispras.ru>
160Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
161Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
Alex Bennéeb8003f92022-03-11 13:41:53 +0000[diff] [blame]162Peter Chubb <peter.chubb@nicta.com.au>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]163Peter Crosthwaite <crosthwaite.peter@gmail.com>
164Peter Crosthwaite <peter.crosthwaite@petalogix.com>
165Peter Crosthwaite <peter.crosthwaite@xilinx.com>
166Prasad J Pandit <pjp@fedoraproject.org>
167Prasad J Pandit <ppandit@redhat.com>
168Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Philippe Mathieu-Daudé957e8b32018-10-11 00:29:43 +0200[diff] [blame]169Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]170Remy Noel <remy.noel@blade-group.com>
171Roger Pau Monné <roger.pau@citrix.com>
172Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
173Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
174Sochin Jiang <sochin.jiang@huawei.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +0100[diff] [blame]175Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]176Takashi Yoshii <takasi-y@ops.dti.ne.jp>
177Thomas Huth <thuth@redhat.com>
178Thomas Knych <thomaswk@google.com>
179Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
180Tony Nguyen <tony.nguyen@bt.com>
181Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
182Vibi Sreenivasan <vibi_sreenivasan@cms.com>
183Vijaya Kumar K <vijayak@cavium.com>
184Vijaya Kumar K <Vijaya.Kumar@cavium.com>
185Vijay Kumar <vijaykumar@bravegnu.org>
186Vijay Kumar <vijaykumar@zilogic.com>
187Wang Guang <wang.guang55@zte.com.cn>
188Wenchao Xia <xiawenc@linux.vnet.ibm.com>
189Wenshuang Ma <kevinnma@tencent.com>
190Xiaoqiang Zhao <zxq_yx_007@163.com>
191Xinhua Cao <caoxinhua@huawei.com>
192Xiong Zhang <xiong.y.zhang@intel.com>
193Yin Yin <yin.yin@cs2c.com.cn>
Yu-Chen Lin4065bb22020-02-06 20:55:04 +0800[diff] [blame]194Yu-Chen Lin <npes87184@gmail.com>
195Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]196YunQiang Su <syq@debian.org>
197YunQiang Su <ysu@wavecomp.com>
198Yuri Pudgorodskiy <yur@virtuozzo.com>
199Zhengui Li <lizhengui@huawei.com>
200Zhenwei Pi <pizhenwei@bytedance.com>
201Zhenwei Pi <zhenwei.pi@youruncloud.com>
202Zhuang Yanying <ann.zhuangyanying@huawei.com>