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