| Eric Blake | 3bd2608 | 2018-03-26 13:41:47 -0500 | [diff] [blame] | 1 | # 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 Maydell | 4cb0165 | 2011-12-12 10:58:26 +0000 | [diff] [blame] | 5 | Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> |
| Anthony Liguori | bc02fb3 | 2013-08-19 08:49:37 -0500 | [diff] [blame] | 6 | Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> |
| Peter Maydell | 4cb0165 | 2011-12-12 10:58:26 +0000 | [diff] [blame] | 7 | Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 8 | Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 9 | Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 10 | Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> |
| Peter Maydell | 4cb0165 | 2011-12-12 10:58:26 +0000 | [diff] [blame] | 11 | Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 12 | Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> |
| Peter Maydell | 4cb0165 | 2011-12-12 10:58:26 +0000 | [diff] [blame] | 13 | Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 14 | malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> |
| Eric Blake | 3bd2608 | 2018-03-26 13:41:47 -0500 | [diff] [blame] | 15 | |
| Peter Maydell | 4cb0165 | 2011-12-12 10:58:26 +0000 | [diff] [blame] | 16 | # There is also a: |
| 17 | # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> |
| 18 | # for the cvs2svn initialization commit e63c3dc74bf. |
| Eric Blake | 3bd2608 | 2018-03-26 13:41:47 -0500 | [diff] [blame] | 19 | |
| 20 | # Next, translate a few commits where mailman rewrote the From: line due |
| 21 | # to strict SPF, although we prefer to avoid adding more entries like that. |
| 22 | Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org> |
| 23 | Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org> |
| 24 | Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org> |
| 25 | Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> |
| 26 | |
| Philippe Mathieu-Daudé | 6b97a1d | 2019-08-23 01:09:14 +0200 | [diff] [blame^] | 27 | # Next, replace old addresses by a more recent one. |
| 28 | Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> |
| 29 | James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> |
| 30 | Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com> |
| 31 | Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com> |
| 32 | Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com> |
| 33 | Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com> |
| 34 | Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org> |
| 35 | Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> |
| Eric Blake | 3bd2608 | 2018-03-26 13:41:47 -0500 | [diff] [blame] | 36 | |
| Daniel P. Berrangé | 57bf554 | 2018-02-02 18:26:59 +0000 | [diff] [blame] | 37 | # Also list preferred name forms where people have changed their |
| Eric Blake | d668c82 | 2018-12-07 11:07:33 -0600 | [diff] [blame] | 38 | # git author config, or had utf8/latin1 encoding issues. |
| Daniel P. Berrangé | 57bf554 | 2018-02-02 18:26:59 +0000 | [diff] [blame] | 39 | Daniel P. Berrangé <berrange@redhat.com> |
| Philippe Mathieu-Daudé | 957e8b3 | 2018-10-11 00:29:43 +0200 | [diff] [blame] | 40 | Reimar Döffinger <Reimar.Doeffinger@gmx.de> |