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