# 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 # # Proper Name # Proper Name Commit Name # # 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 balrog Anthony Liguori aliguori Aurelien Jarno aurel32 Blue Swirl blueswir1 Edgar E. Iglesias edgar_igl Fabrice Bellard bellard Jocelyn Mayer j_mayer Paul Brook pbrook Thiemo Seufer ths malc malc # Corrupted Author fields Aaron Larson alarson@ddci.com Andreas Färber Andreas Färber Jason Wang Jason Wang Marek Dolata mkdolata@us.ibm.com Michael Ellerman michael@ozlabs.org Nick Hudson hnick@vmware.com # 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 Ed Swierk via Qemu-devel Ian McKellar Ian McKellar via Qemu-devel Julia Suvorova Julia Suvorova via Qemu-devel Justin Terry (VM) Justin Terry (VM) via Qemu-devel Stefan Weil Stefan Weil via Andrey Drobyshev Andrey Drobyshev via # Next, replace old addresses by a more recent one. Aleksandar Markovic Aleksandar Markovic Aleksandar Markovic Aleksandar Rikalo Aleksandar Rikalo Alexander Graf Ani Sinha Anthony Liguori Anthony Liguori Christian Borntraeger Damien Hedde Filip Bozuta Frederic Konrad Frederic Konrad Greg Kurz Huacai Chen Huacai Chen James Hogan Leif Lindholm Leif Lindholm Radoslaw Biernacki Paul Brook Paul Burton Paul Burton Paul Burton Paul Burton Philippe Mathieu-Daudé Philippe Mathieu-Daudé Philippe Mathieu-Daudé Roman Bolshakov Stefan Brankovic Taylor Simpson Yongbok Kim # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. Aaron Lindsay Aaron Larson Alexey Gerasimenko Alex Chen Alex Ivanov Andreas Färber Bandan Das Benjamin MARSILI Benoît Canet Benoît Canet Benoît Canet Boqun Feng Boqun Feng Brad Smith Brijesh Singh Brilly Wu Cédric Vincent CheneyLin Chen Gang Chen Gang Chen Gang Chen Wei-Ren Christophe Lyon Collin L. Walling Daniel P. Berrangé Eduardo Otubo Erik Smit Fabrice Desclaux Fernando Luis Vázquez Cao Fernando Luis Vázquez Cao Gautham R. Shenoy Gautham R. Shenoy Gonglei (Arei) Guang Wang Haibin Zhang Hailiang Zhang Hanna Reitz Hervé Poussineau Hyman Huang Jakub Jermář Jakub Jermář Jean-Christophe Dubois Jindřich Makovička John Arbuckle Juha Riihimäki Juha Riihimäki Jun Li Laurent Vivier Leandro Lupori Li Guang Liming Wang linzhecheng Liran Schour Liu Yu Liu Yu Li Zhang Li Zhang Lluís Vilanova Lluís Vilanova Longpeng (Mike) Luc Michel Luc Michel Marc Marí Marc Marí Michael Avdienko Michael S. Tsirkin Munkyu Im Nicholas Bellinger Nicholas Thomas Nikunj A Dadhania Orit Wasserman Paolo Bonzini Pan Nengyuan Pavel Dovgaluk Pavel Dovgaluk Pavel Dovgaluk Peter Chubb Peter Crosthwaite Peter Crosthwaite Peter Crosthwaite Prasad J Pandit Prasad J Pandit Qiao Nuohan Reimar Döffinger Remy Noel Roger Pau Monné Shin'ichiro Kawasaki Shin'ichiro Kawasaki Sochin Jiang Stefan Berger Takashi Yoshii Thomas Huth Thomas Knych Timothy Baldwin Tony Nguyen Venkateswararao Jujjuri Vibi Sreenivasan Vijaya Kumar K Vijaya Kumar K Vijay Kumar Vijay Kumar Wang Guang Wenchao Xia Wenshuang Ma Xiaoqiang Zhao Xinhua Cao Xiong Zhang Yin Yin Yu-Chen Lin Yu-Chen Lin YunQiang Su YunQiang Su Yuri Pudgorodskiy Zhengui Li Zhenwei Pi Zhenwei Pi Zhuang Yanying