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