Revert "ide/ahci: Check for -ECANCELED in aio callbacks"

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 7b91a95d95d045bfb25ad8608d944e5b9e266b4d..b8e08297c9096d0e6910e4944e4a569a2d5b3c40 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,16 +1,39 @@
-# 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]>
 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>
+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>
+Yongbok Kim <[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, or had utf8/latin1 encoding issues.
+Daniel P. Berrangé <[email protected]>
+Reimar Döffinger <[email protected]>