blob: a1bd659817d24c2ccb1420a8fd9ad902ae3a07e2 [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
Peter Maydell4cb01652011-12-12 10:58:26 +000030# There is also a:
31# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
32# for the cvs2svn initialization commit e63c3dc74bf.
Eric Blake3bd26082018-03-26 13:41:47 -050033
34# Next, translate a few commits where mailman rewrote the From: line due
35# to strict SPF, although we prefer to avoid adding more entries like that.
36Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
37Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
38Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
39Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
40
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +020041# Next, replace old addresses by a more recent one.
Aleksandar Markovic0eac70b2020-03-13 02:00:51 +010042Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
43Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
44Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
Aleksandar Markovic97d89742020-05-18 22:09:16 +020045Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
46Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
Philippe Mathieu-Daudé0f57f8d2020-07-02 19:38:00 +020047Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
Aleksandar Markovic63640d62019-10-23 12:23:36 +020048Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Aleksandar Markoviccdcb6392020-06-02 10:52:14 +020049Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
Philippe Mathieu-Daudé449fd1f2020-05-18 12:39:20 +020050Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
Greg Kurz3c9ef9c2020-08-12 17:37:31 +020051Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
Huacai Chendab1e1e2020-12-05 17:22:01 +080052Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
53Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
Aleksandar Markovic63640d62019-10-23 12:23:36 +020054James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Leif Lindholmaff55692020-01-16 17:42:26 +000055Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
Radoslaw Biernacki428a3772020-05-12 19:07:04 +020056Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
Philippe Mathieu-Daudé2b107c22020-07-07 04:25:44 +020057Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
58Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
59Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
60Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
Aleksandar Markovicf364a8d2020-06-02 10:52:15 +020061Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +020062Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
Eric Blake3bd26082018-03-26 13:41:47 -050063
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +000064# Also list preferred name forms where people have changed their
Eric Blaked668c822018-12-07 11:07:33 -060065# git author config, or had utf8/latin1 encoding issues.
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +020066Aaron Lindsay <aaron@os.amperecomputing.com>
67Alexey Gerasimenko <x1917x@gmail.com>
68Alex Ivanov <void@aleksoft.net>
69Andreas Färber <afaerber@suse.de>
70Bandan Das <bsd@redhat.com>
71Benjamin MARSILI <mlspirat42@gmail.com>
72Benoît Canet <benoit.canet@gmail.com>
73Benoît Canet <benoit.canet@irqsave.net>
74Benoît Canet <benoit.canet@nodalink.com>
75Boqun Feng <boqun.feng@gmail.com>
76Boqun Feng <boqun.feng@intel.com>
77Brad Smith <brad@comstyle.com>
78Brijesh Singh <brijesh.singh@amd.com>
79Brilly Wu <brillywu@viatech.com.cn>
80Cédric Vincent <cedric.vincent@st.com>
81CheneyLin <linzc@zju.edu.cn>
82Chen Gang <chengang@emindsoft.com.cn>
83Chen Gang <gang.chen.5i5j@gmail.com>
84Chen Gang <gang.chen@sunrus.com.cn>
85Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
86Christophe Lyon <christophe.lyon@st.com>
87Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +000088Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +020089Eduardo Otubo <otubo@redhat.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +010090Erik Smit <erik.lucas.smit@gmail.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +020091Fabrice Desclaux <fabrice.desclaux@cea.fr>
92Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
93Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
94Gautham R. Shenoy <ego@in.ibm.com>
95Gautham R. Shenoy <ego@linux.vnet.ibm.com>
96Gonglei (Arei) <arei.gonglei@huawei.com>
97Guang Wang <wang.guang55@zte.com.cn>
98Hailiang Zhang <zhang.zhanghailiang@huawei.com>
99Hervé Poussineau <hpoussin@reactos.org>
100Jakub Jermář <jakub@jermar.eu>
101Jakub Jermář <jakub.jermar@kernkonzept.com>
102Jean-Christophe Dubois <jcd@tribudubois.net>
103Jindřich Makovička <makovick@gmail.com>
104John Arbuckle <programmingkidx@gmail.com>
105Juha Riihimäki <juha.riihimaki@nokia.com>
106Juha Riihimäki <Juha.Riihimaki@nokia.com>
107Jun Li <junmuzi@gmail.com>
108Laurent Vivier <Laurent@lvivier.info>
109Leandro Lupori <leandro.lupori@gmail.com>
110Li Guang <lig.fnst@cn.fujitsu.com>
111Liming Wang <walimisdev@gmail.com>
112linzhecheng <linzc@zju.edu.cn>
113Liran Schour <lirans@il.ibm.com>
114Liu Yu <yu.liu@freescale.com>
115Liu Yu <Yu.Liu@freescale.com>
116Li Zhang <zhlcindy@gmail.com>
117Li Zhang <zhlcindy@linux.vnet.ibm.com>
118Lluís Vilanova <vilanova@ac.upc.edu>
119Lluís Vilanova <xscript@gmx.net>
120Longpeng (Mike) <longpeng2@huawei.com>
121Luc Michel <luc.michel@git.antfield.fr>
122Luc Michel <luc.michel@greensocs.com>
123Marc Marí <marc.mari.barcelo@gmail.com>
124Marc Marí <markmb@redhat.com>
125Michael Avdienko <whitearchey@gmail.com>
126Michael S. Tsirkin <mst@redhat.com>
127Munkyu Im <munkyu.im@samsung.com>
128Nicholas Bellinger <nab@linux-iscsi.org>
129Nicholas Thomas <nick@bytemark.co.uk>
130Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
131Orit Wasserman <owasserm@redhat.com>
132Paolo Bonzini <pbonzini@redhat.com>
133Pavel Dovgaluk <dovgaluk@ispras.ru>
134Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
135Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
136Peter Crosthwaite <crosthwaite.peter@gmail.com>
137Peter Crosthwaite <peter.crosthwaite@petalogix.com>
138Peter Crosthwaite <peter.crosthwaite@xilinx.com>
139Prasad J Pandit <pjp@fedoraproject.org>
140Prasad J Pandit <ppandit@redhat.com>
141Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Philippe Mathieu-Daudé957e8b32018-10-11 00:29:43 +0200142Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200143Remy Noel <remy.noel@blade-group.com>
144Roger Pau Monné <roger.pau@citrix.com>
145Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
146Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
147Sochin Jiang <sochin.jiang@huawei.com>
Philippe Mathieu-Daudé98d3a722020-10-07 17:00:34 +0100148Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200149Takashi Yoshii <takasi-y@ops.dti.ne.jp>
150Thomas Huth <thuth@redhat.com>
151Thomas Knych <thomaswk@google.com>
152Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
153Tony Nguyen <tony.nguyen@bt.com>
154Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
155Vibi Sreenivasan <vibi_sreenivasan@cms.com>
156Vijaya Kumar K <vijayak@cavium.com>
157Vijaya Kumar K <Vijaya.Kumar@cavium.com>
158Vijay Kumar <vijaykumar@bravegnu.org>
159Vijay Kumar <vijaykumar@zilogic.com>
160Wang Guang <wang.guang55@zte.com.cn>
161Wenchao Xia <xiawenc@linux.vnet.ibm.com>
162Wenshuang Ma <kevinnma@tencent.com>
163Xiaoqiang Zhao <zxq_yx_007@163.com>
164Xinhua Cao <caoxinhua@huawei.com>
165Xiong Zhang <xiong.y.zhang@intel.com>
166Yin Yin <yin.yin@cs2c.com.cn>
Yu-Chen Lin4065bb22020-02-06 20:55:04 +0800167Yu-Chen Lin <npes87184@gmail.com>
168Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200169YunQiang Su <syq@debian.org>
170YunQiang Su <ysu@wavecomp.com>
171Yuri Pudgorodskiy <yur@virtuozzo.com>
172Zhengui Li <lizhengui@huawei.com>
173Zhenwei Pi <pizhenwei@bytedance.com>
174Zhenwei Pi <zhenwei.pi@youruncloud.com>
175Zhuang Yanying <ann.zhuangyanying@huawei.com>