]> git.proxmox.com Git - mirror_qemu.git/blob - .mailmap
Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-6.1-rc1-230721-1' into...
[mirror_qemu.git] / .mailmap
1 # This mailmap fixes up author names/addresses.
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 #
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.
19 Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
20 Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
21 Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
22 Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
23 Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
24 Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
25 Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
26 Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
27 Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
28 malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
29
30 # Corrupted Author fields
31 Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
32 Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
33
34 # There is also a:
35 # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
36 # for the cvs2svn initialization commit e63c3dc74bf.
37
38 # Next, translate a few commits where mailman rewrote the From: line due
39 # to strict SPF, although we prefer to avoid adding more entries like that.
40 Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
41 Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
42 Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
43 Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
44
45 # Next, replace old addresses by a more recent one.
46 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>
47 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>
48 Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>
49 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com>
50 Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>
51 Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
52 Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
53 Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
54 Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
55 Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
56 Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
57 Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
58 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
59 Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
60 Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
61 Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
62 Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
63 Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
64 Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
65 Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
66 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
67
68 # Also list preferred name forms where people have changed their
69 # git author config, or had utf8/latin1 encoding issues.
70 Aaron Lindsay <aaron@os.amperecomputing.com>
71 Alexey Gerasimenko <x1917x@gmail.com>
72 Alex Ivanov <void@aleksoft.net>
73 Andreas Färber <afaerber@suse.de>
74 Bandan Das <bsd@redhat.com>
75 Benjamin MARSILI <mlspirat42@gmail.com>
76 Benoît Canet <benoit.canet@gmail.com>
77 Benoît Canet <benoit.canet@irqsave.net>
78 Benoît Canet <benoit.canet@nodalink.com>
79 Boqun Feng <boqun.feng@gmail.com>
80 Boqun Feng <boqun.feng@intel.com>
81 Brad Smith <brad@comstyle.com>
82 Brijesh Singh <brijesh.singh@amd.com>
83 Brilly Wu <brillywu@viatech.com.cn>
84 Cédric Vincent <cedric.vincent@st.com>
85 CheneyLin <linzc@zju.edu.cn>
86 Chen Gang <chengang@emindsoft.com.cn>
87 Chen Gang <gang.chen.5i5j@gmail.com>
88 Chen Gang <gang.chen@sunrus.com.cn>
89 Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
90 Christophe Lyon <christophe.lyon@st.com>
91 Collin L. Walling <walling@linux.ibm.com>
92 Daniel P. Berrangé <berrange@redhat.com>
93 Eduardo Otubo <otubo@redhat.com>
94 Erik Smit <erik.lucas.smit@gmail.com>
95 Fabrice Desclaux <fabrice.desclaux@cea.fr>
96 Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
97 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
98 Gautham R. Shenoy <ego@in.ibm.com>
99 Gautham R. Shenoy <ego@linux.vnet.ibm.com>
100 Gonglei (Arei) <arei.gonglei@huawei.com>
101 Guang Wang <wang.guang55@zte.com.cn>
102 Hailiang Zhang <zhang.zhanghailiang@huawei.com>
103 Hervé Poussineau <hpoussin@reactos.org>
104 Jakub Jermář <jakub@jermar.eu>
105 Jakub Jermář <jakub.jermar@kernkonzept.com>
106 Jean-Christophe Dubois <jcd@tribudubois.net>
107 Jindřich Makovička <makovick@gmail.com>
108 John Arbuckle <programmingkidx@gmail.com>
109 Juha Riihimäki <juha.riihimaki@nokia.com>
110 Juha Riihimäki <Juha.Riihimaki@nokia.com>
111 Jun Li <junmuzi@gmail.com>
112 Laurent Vivier <Laurent@lvivier.info>
113 Leandro Lupori <leandro.lupori@gmail.com>
114 Li Guang <lig.fnst@cn.fujitsu.com>
115 Liming Wang <walimisdev@gmail.com>
116 linzhecheng <linzc@zju.edu.cn>
117 Liran Schour <lirans@il.ibm.com>
118 Liu Yu <yu.liu@freescale.com>
119 Liu Yu <Yu.Liu@freescale.com>
120 Li Zhang <zhlcindy@gmail.com>
121 Li Zhang <zhlcindy@linux.vnet.ibm.com>
122 Lluís Vilanova <vilanova@ac.upc.edu>
123 Lluís Vilanova <xscript@gmx.net>
124 Longpeng (Mike) <longpeng2@huawei.com>
125 Luc Michel <luc.michel@git.antfield.fr>
126 Luc Michel <luc.michel@greensocs.com>
127 Marc Marí <marc.mari.barcelo@gmail.com>
128 Marc Marí <markmb@redhat.com>
129 Michael Avdienko <whitearchey@gmail.com>
130 Michael S. Tsirkin <mst@redhat.com>
131 Munkyu Im <munkyu.im@samsung.com>
132 Nicholas Bellinger <nab@linux-iscsi.org>
133 Nicholas Thomas <nick@bytemark.co.uk>
134 Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
135 Orit Wasserman <owasserm@redhat.com>
136 Paolo Bonzini <pbonzini@redhat.com>
137 Pavel Dovgaluk <dovgaluk@ispras.ru>
138 Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
139 Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
140 Peter Crosthwaite <crosthwaite.peter@gmail.com>
141 Peter Crosthwaite <peter.crosthwaite@petalogix.com>
142 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
143 Prasad J Pandit <pjp@fedoraproject.org>
144 Prasad J Pandit <ppandit@redhat.com>
145 Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
146 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
147 Remy Noel <remy.noel@blade-group.com>
148 Roger Pau Monné <roger.pau@citrix.com>
149 Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
150 Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
151 Sochin Jiang <sochin.jiang@huawei.com>
152 Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
153 Takashi Yoshii <takasi-y@ops.dti.ne.jp>
154 Thomas Huth <thuth@redhat.com>
155 Thomas Knych <thomaswk@google.com>
156 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
157 Tony Nguyen <tony.nguyen@bt.com>
158 Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
159 Vibi Sreenivasan <vibi_sreenivasan@cms.com>
160 Vijaya Kumar K <vijayak@cavium.com>
161 Vijaya Kumar K <Vijaya.Kumar@cavium.com>
162 Vijay Kumar <vijaykumar@bravegnu.org>
163 Vijay Kumar <vijaykumar@zilogic.com>
164 Wang Guang <wang.guang55@zte.com.cn>
165 Wenchao Xia <xiawenc@linux.vnet.ibm.com>
166 Wenshuang Ma <kevinnma@tencent.com>
167 Xiaoqiang Zhao <zxq_yx_007@163.com>
168 Xinhua Cao <caoxinhua@huawei.com>
169 Xiong Zhang <xiong.y.zhang@intel.com>
170 Yin Yin <yin.yin@cs2c.com.cn>
171 Yu-Chen Lin <npes87184@gmail.com>
172 Yu-Chen Lin <npes87184@gmail.com> <yuchenlin@synology.com>
173 YunQiang Su <syq@debian.org>
174 YunQiang Su <ysu@wavecomp.com>
175 Yuri Pudgorodskiy <yur@virtuozzo.com>
176 Zhengui Li <lizhengui@huawei.com>
177 Zhenwei Pi <pizhenwei@bytedance.com>
178 Zhenwei Pi <zhenwei.pi@youruncloud.com>
179 Zhuang Yanying <ann.zhuangyanying@huawei.com>