Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- .mailmap | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap index 6f2ff22a45..8475adf799 100644 --- a/.mailmap +++ b/.mailmap @@ -4,26 +4,31 @@ # into proper addresses so that they are counted properly by git shortlog. Andrzej Zaborowski <balr...@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Anthony Liguori <anth...@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> -Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori <aligu...@us.ibm.com> Aurelien Jarno <aurel...@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> Blue Swirl <blauwir...@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <edgar.igles...@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <fabr...@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> -James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> Jocelyn Mayer <l_ind...@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <p...@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> -Aleksandar Markovic <amarko...@wavecomp.com> <aleksandar.marko...@mips.com> -Aleksandar Markovic <amarko...@wavecomp.com> <aleksandar.marko...@imgtec.com> -Paul Burton <pbur...@wavecomp.com> <paul.bur...@mips.com> -Paul Burton <pbur...@wavecomp.com> <paul.bur...@imgtec.com> -Paul Burton <pbur...@wavecomp.com> <p...@archlinuxmips.org> Thiemo Seufer <t...@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <av1...@comtv.ru> 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. + +# This section is to track prefered (or last up to date) email for people +# that uses (or had use) various emails. +# Example can be people changing from companies, or companies changing their +# name. +Aleksandar Markovic <amarko...@wavecomp.com> <aleksandar.marko...@imgtec.com> +Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori <aligu...@us.ibm.com> +James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> +Paul Burton <pbur...@wavecomp.com> <paul.bur...@mips.com> +Paul Burton <pbur...@wavecomp.com> <paul.bur...@imgtec.com> +Paul Burton <pbur...@wavecomp.com> <p...@archlinuxmips.org> + + # 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 <eswi...@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org> -- 2.19.1
