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