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