Google Git
Sign in
qemu / qemu / a9cf5c46c6a6fd965cf12ddb37f44d25e914bf04 / . / .mailmap
blob: 926cac6bb8b2df52fd5baca9e57c76ccac75828e [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
Peter Maydell4cb01652011-12-12 10:58:26 +0000[diff] [blame]30# 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 -0500[diff] [blame]33
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 +0200[diff] [blame]41# Next, replace old addresses by a more recent one.
Aleksandar Markovic0eac70b2020-03-13 02:00:51 +0100[diff] [blame]42Aleksandar 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 +0200[diff] [blame]45Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
46Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
Aleksandar Markovic63640d62019-10-23 12:23:36 +0200[diff] [blame]47Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Aleksandar Markoviccdcb6392020-06-02 10:52:14 +0200[diff] [blame]48Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
Philippe Mathieu-Daudé449fd1f2020-05-18 12:39:20 +0200[diff] [blame]49Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
Aleksandar Markovic63640d62019-10-23 12:23:36 +0200[diff] [blame]50James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Leif Lindholmaff55692020-01-16 17:42:26 +0000[diff] [blame]51Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +0200[diff] [blame]52Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
53Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
54Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
Philippe Mathieu-Daudé28937122019-08-23 01:09:15 +0200[diff] [blame]55Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
Aleksandar Markovicf364a8d2020-06-02 10:52:15 +0200[diff] [blame]56Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
Philippe Mathieu-Daudé6b97a1d2019-08-23 01:09:14 +0200[diff] [blame]57Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
Eric Blake3bd26082018-03-26 13:41:47 -0500[diff] [blame]58
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000[diff] [blame]59# Also list preferred name forms where people have changed their
Eric Blaked668c822018-12-07 11:07:33 -0600[diff] [blame]60# git author config, or had utf8/latin1 encoding issues.
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]61Aaron Lindsay <aaron@os.amperecomputing.com>
62Alexey Gerasimenko <x1917x@gmail.com>
63Alex Ivanov <void@aleksoft.net>
64Andreas Färber <afaerber@suse.de>
65Bandan Das <bsd@redhat.com>
66Benjamin MARSILI <mlspirat42@gmail.com>
67Benoît Canet <benoit.canet@gmail.com>
68Benoît Canet <benoit.canet@irqsave.net>
69Benoît Canet <benoit.canet@nodalink.com>
70Boqun Feng <boqun.feng@gmail.com>
71Boqun Feng <boqun.feng@intel.com>
72Brad Smith <brad@comstyle.com>
73Brijesh Singh <brijesh.singh@amd.com>
74Brilly Wu <brillywu@viatech.com.cn>
75Cédric Vincent <cedric.vincent@st.com>
76CheneyLin <linzc@zju.edu.cn>
77Chen Gang <chengang@emindsoft.com.cn>
78Chen Gang <gang.chen.5i5j@gmail.com>
79Chen Gang <gang.chen@sunrus.com.cn>
80Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
81Christophe Lyon <christophe.lyon@st.com>
82Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +0000[diff] [blame]83Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]84Eduardo Otubo <otubo@redhat.com>
85Fabrice Desclaux <fabrice.desclaux@cea.fr>
86Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
87Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
88Gautham R. Shenoy <ego@in.ibm.com>
89Gautham R. Shenoy <ego@linux.vnet.ibm.com>
90Gonglei (Arei) <arei.gonglei@huawei.com>
91Guang Wang <wang.guang55@zte.com.cn>
92Hailiang Zhang <zhang.zhanghailiang@huawei.com>
93Hervé Poussineau <hpoussin@reactos.org>
94Jakub Jermář <jakub@jermar.eu>
95Jakub Jermář <jakub.jermar@kernkonzept.com>
96Jean-Christophe Dubois <jcd@tribudubois.net>
97Jindřich Makovička <makovick@gmail.com>
98John Arbuckle <programmingkidx@gmail.com>
99Juha Riihimäki <juha.riihimaki@nokia.com>
100Juha Riihimäki <Juha.Riihimaki@nokia.com>
101Jun Li <junmuzi@gmail.com>
102Laurent Vivier <Laurent@lvivier.info>
103Leandro Lupori <leandro.lupori@gmail.com>
104Li Guang <lig.fnst@cn.fujitsu.com>
105Liming Wang <walimisdev@gmail.com>
106linzhecheng <linzc@zju.edu.cn>
107Liran Schour <lirans@il.ibm.com>
108Liu Yu <yu.liu@freescale.com>
109Liu Yu <Yu.Liu@freescale.com>
110Li Zhang <zhlcindy@gmail.com>
111Li Zhang <zhlcindy@linux.vnet.ibm.com>
112Lluís Vilanova <vilanova@ac.upc.edu>
113Lluís Vilanova <xscript@gmx.net>
114Longpeng (Mike) <longpeng2@huawei.com>
115Luc Michel <luc.michel@git.antfield.fr>
116Luc Michel <luc.michel@greensocs.com>
117Marc Marí <marc.mari.barcelo@gmail.com>
118Marc Marí <markmb@redhat.com>
119Michael Avdienko <whitearchey@gmail.com>
120Michael S. Tsirkin <mst@redhat.com>
121Munkyu Im <munkyu.im@samsung.com>
122Nicholas Bellinger <nab@linux-iscsi.org>
123Nicholas Thomas <nick@bytemark.co.uk>
124Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
125Orit Wasserman <owasserm@redhat.com>
126Paolo Bonzini <pbonzini@redhat.com>
127Pavel Dovgaluk <dovgaluk@ispras.ru>
128Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
129Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
130Peter Crosthwaite <crosthwaite.peter@gmail.com>
131Peter Crosthwaite <peter.crosthwaite@petalogix.com>
132Peter Crosthwaite <peter.crosthwaite@xilinx.com>
133Prasad J Pandit <pjp@fedoraproject.org>
134Prasad J Pandit <ppandit@redhat.com>
135Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Philippe Mathieu-Daudé957e8b32018-10-11 00:29:43 +0200[diff] [blame]136Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]137Remy Noel <remy.noel@blade-group.com>
138Roger Pau Monné <roger.pau@citrix.com>
139Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
140Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
141Sochin Jiang <sochin.jiang@huawei.com>
142Takashi Yoshii <takasi-y@ops.dti.ne.jp>
143Thomas Huth <thuth@redhat.com>
144Thomas Knych <thomaswk@google.com>
145Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
146Tony Nguyen <tony.nguyen@bt.com>
147Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
148Vibi Sreenivasan <vibi_sreenivasan@cms.com>
149Vijaya Kumar K <vijayak@cavium.com>
150Vijaya Kumar K <Vijaya.Kumar@cavium.com>
151Vijay Kumar <vijaykumar@bravegnu.org>
152Vijay Kumar <vijaykumar@zilogic.com>
153Wang Guang <wang.guang55@zte.com.cn>
154Wenchao Xia <xiawenc@linux.vnet.ibm.com>
155Wenshuang Ma <kevinnma@tencent.com>
156Xiaoqiang Zhao <zxq_yx_007@163.com>
157Xinhua Cao <caoxinhua@huawei.com>
158Xiong Zhang <xiong.y.zhang@intel.com>
159Yin Yin <yin.yin@cs2c.com.cn>
Yu-Chen Lin4065bb22020-02-06 20:55:04 +0800[diff] [blame]160Yu-Chen Lin <npes87184@gmail.com>
161Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
Philippe Mathieu-Daudé1fed8f02019-08-23 01:09:16 +0200[diff] [blame]162YunQiang Su <syq@debian.org>
163YunQiang Su <ysu@wavecomp.com>
164Yuri Pudgorodskiy <yur@virtuozzo.com>
165Zhengui Li <lizhengui@huawei.com>
166Zhenwei Pi <pizhenwei@bytedance.com>
167Zhenwei Pi <zhenwei.pi@youruncloud.com>
168Zhuang Yanying <ann.zhuangyanying@huawei.com>