# This mailmap fixes up author names/addresses.
#
# If you are adding to this file consider if a similar change needs to
# be made to contrib/gitdm/aliases. They are not however completely
# analogous. .mailmap is concerned with fixing up damaged author
# fields where as the gitdm equivalent is more concerned with making
# sure multiple email addresses get mapped onto the same author.
#
# From man git-shortlog the forms are:
#
#  Proper Name <[email protected]>
#  <[email protected]> <[email protected]>
#  Proper Name <[email protected]> <[email protected]>
#  Proper Name <[email protected]> Commit Name <[email protected]>
#

# The first section translates weird addresses from the original git import
# into proper addresses so that they are counted properly by git shortlog.
Andrzej Zaborowski <[email protected]> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguori <[email protected]> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Aurelien Jarno <[email protected]> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Blue Swirl <[email protected]> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Edgar E. Iglesias <[email protected]> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>

# There is also a:
#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
# for the cvs2svn initialization commit e63c3dc74bf.

# Next, translate a few commits where mailman rewrote the From: line due
# to strict SPF, although we prefer to avoid adding more entries like that.
Ed Swierk <[email protected]> Ed Swierk via Qemu-devel <[email protected]>
Ian McKellar <[email protected]> Ian McKellar via Qemu-devel <[email protected]>
Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <[email protected]>
Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <[email protected]>

# Next, replace old addresses by a more recent one.
Aleksandar Markovic <[email protected]> <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Aleksandar Rikalo <[email protected]> <[email protected]>
Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
James Hogan <[email protected]> <[email protected]>
Leif Lindholm <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Philippe Mathieu-Daudé <[email protected]> <[email protected]>
Yongbok Kim <[email protected]> <[email protected]>

# Also list preferred name forms where people have changed their
# git author config, or had utf8/latin1 encoding issues.
Aaron Lindsay <[email protected]>
Alexey Gerasimenko <[email protected]>
Alex Ivanov <[email protected]>
Andreas Färber <[email protected]>
Bandan Das <[email protected]>
Benjamin MARSILI <[email protected]>
Benoît Canet <[email protected]>
Benoît Canet <[email protected]>
Benoît Canet <[email protected]>
Boqun Feng <[email protected]>
Boqun Feng <[email protected]>
Brad Smith <[email protected]>
Brijesh Singh <[email protected]>
Brilly Wu <[email protected]>
Cédric Vincent <[email protected]>
CheneyLin <[email protected]>
Chen Gang <[email protected]>
Chen Gang <[email protected]>
Chen Gang <[email protected]>
Chen Wei-Ren <[email protected]>
Christophe Lyon <[email protected]>
Collin L. Walling <[email protected]>
Daniel P. Berrangé <[email protected]>
Eduardo Otubo <[email protected]>
Fabrice Desclaux <[email protected]>
Fernando Luis Vázquez Cao <[email protected]>
Fernando Luis Vázquez Cao <[email protected]>
Gautham R. Shenoy <[email protected]>
Gautham R. Shenoy <[email protected]>
Gonglei (Arei) <[email protected]>
Guang Wang <[email protected]>
Hailiang Zhang <[email protected]>
Hervé Poussineau <[email protected]>
Jakub Jermář <[email protected]>
Jakub Jermář <[email protected]>
Jean-Christophe Dubois <[email protected]>
Jindřich Makovička <[email protected]>
John Arbuckle <[email protected]>
Juha Riihimäki <[email protected]>
Juha Riihimäki <[email protected]>
Jun Li <[email protected]>
Laurent Vivier <[email protected]>
Leandro Lupori <[email protected]>
Li Guang <[email protected]>
Liming Wang <[email protected]>
linzhecheng <[email protected]>
Liran Schour <[email protected]>
Liu Yu <[email protected]>
Liu Yu <[email protected]>
Li Zhang <[email protected]>
Li Zhang <[email protected]>
Lluís Vilanova <[email protected]>
Lluís Vilanova <[email protected]>
Longpeng (Mike) <[email protected]>
Luc Michel <[email protected]>
Luc Michel <[email protected]>
Marc Marí <[email protected]>
Marc Marí <[email protected]>
Michael Avdienko <[email protected]>
Michael S. Tsirkin <[email protected]>
Munkyu Im <[email protected]>
Nicholas Bellinger <[email protected]>
Nicholas Thomas <[email protected]>
Nikunj A Dadhania <[email protected]>
Orit Wasserman <[email protected]>
Paolo Bonzini <[email protected]>
Pavel Dovgaluk <[email protected]>
Pavel Dovgaluk <[email protected]>
Pavel Dovgaluk <[email protected]>
Peter Crosthwaite <[email protected]>
Peter Crosthwaite <[email protected]>
Peter Crosthwaite <[email protected]>
Prasad J Pandit <[email protected]>
Prasad J Pandit <[email protected]>
Qiao Nuohan <[email protected]>
Reimar Döffinger <[email protected]>
Remy Noel <[email protected]>
Roger Pau Monné <[email protected]>
Shin'ichiro Kawasaki <[email protected]>
Shin'ichiro Kawasaki <[email protected]>
Sochin Jiang <[email protected]>
Takashi Yoshii <[email protected]>
Thomas Huth <[email protected]>
Thomas Knych <[email protected]>
Timothy Baldwin <[email protected]>
Tony Nguyen <[email protected]>
Venkateswararao Jujjuri <[email protected]>
Vibi Sreenivasan <[email protected]>
Vijaya Kumar K <[email protected]>
Vijaya Kumar K <[email protected]>
Vijay Kumar <[email protected]>
Vijay Kumar <[email protected]>
Wang Guang <[email protected]>
Wenchao Xia <[email protected]>
Wenshuang Ma <[email protected]>
Xiaoqiang Zhao <[email protected]>
Xinhua Cao <[email protected]>
Xiong Zhang <[email protected]>
Yin Yin <[email protected]>
Yu-Chen Lin <[email protected]>
Yu-Chen Lin <[email protected]> <[email protected]>
YunQiang Su <[email protected]>
YunQiang Su <[email protected]>
Yuri Pudgorodskiy <[email protected]>
Zhengui Li <[email protected]>
Zhenwei Pi <[email protected]>
Zhenwei Pi <[email protected]>
Zhuang Yanying <[email protected]>