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