blob: b8e08297c9096d0e6910e4944e4a569a2d5b3c40 [file] [log] [blame]
Eric Blake3bd26082018-03-26 13:41:47 -05001# This mailmap fixes up author names/addresses.
2
3# The first section translates weird addresses from the original git import
4# into proper addresses so that they are counted properly by git shortlog.
Peter Maydell4cb01652011-12-12 10:58:26 +00005Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguoribc02fb32013-08-19 08:49:37 -05006Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguori863a8342013-09-05 09:40:02 -05007Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Peter Maydell4cb01652011-12-12 10:58:26 +00008Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
9Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
10Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
11Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
James Hogana7a2d7d2017-10-17 15:13:11 +010012James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Peter Maydell4cb01652011-12-12 10:58:26 +000013Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
14Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Aleksandar Markovic8c2218e2018-10-15 10:10:25 +020015Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
Aleksandar Markovic4872fee2018-08-02 16:15:48 +020016Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
17Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
18Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
19Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
20Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
Peter Maydell4cb01652011-12-12 10:58:26 +000021Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
22malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
Eric Blake3bd26082018-03-26 13:41:47 -050023
Peter Maydell4cb01652011-12-12 10:58:26 +000024# There is also a:
25# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
26# for the cvs2svn initialization commit e63c3dc74bf.
Eric Blake3bd26082018-03-26 13:41:47 -050027
28# Next, translate a few commits where mailman rewrote the From: line due
29# to strict SPF, although we prefer to avoid adding more entries like that.
30Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
31Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
32Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
33Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
34
35
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +000036# Also list preferred name forms where people have changed their
Eric Blaked668c822018-12-07 11:07:33 -060037# git author config, or had utf8/latin1 encoding issues.
Daniel P. Berrangé57bf5542018-02-02 18:26:59 +000038Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé957e8b32018-10-11 00:29:43 +020039Reimar Döffinger <Reimar.Doeffinger@gmx.de>