Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios.for-upstream-201810...

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index ee81ac801ebc9cf84a601bded2e11ba04bbf48d4..2c2b9b120537e53de7889c52d9ee6b3877977d29 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
-# This mailmap just translates the weird addresses from the original import into git
-# into proper addresses so that they are counted properly in git shortlog output.
-#
+# This mailmap fixes up author names/addresses.
+
+# 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>
 Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
@@ -11,10 +12,26 @@ Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-7
 James Hogan <[email protected]> <[email protected]>
 Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
 Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Paul Burton <[email protected]> <[email protected]>
-Paul Burton <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
 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]>
+
+
+# Also list preferred name forms where people have changed their
+# git author config
+Daniel P. Berrangé <[email protected]>