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