[Qemu-devel] [PATCH v1 3/8] mailmap: Reorder by sections

[Alex Bennée]

From: Philippe Mathieu-Daudé <address@hidden>

Our mailmap currently has 4 sections somehow documented.
Reorder few entries not related to "addresses from the original
git import" into the 3rd section, and add a comment to describe
it.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
 .mailmap | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.mailmap b/.mailmap
index b8e08297c90..e1fdc88d25d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,20 +4,12 @@
 # into proper addresses so that they are counted properly by git shortlog.
 Andrzej Zaborowski <address@hidden> balrog 
<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
 Anthony Liguori <address@hidden> aliguori 
<aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
-Anthony Liguori <address@hidden> Anthony Liguori <address@hidden>
 Aurelien Jarno <address@hidden> aurel32 
<aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Blue Swirl <address@hidden> blueswir1 
<blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
 Edgar E. Iglesias <address@hidden> edgar_igl 
<edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
 Fabrice Bellard <address@hidden> bellard 
<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
-James Hogan <address@hidden> <address@hidden>
 Jocelyn Mayer <address@hidden> j_mayer 
<j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
 Paul Brook <address@hidden> pbrook 
<pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Yongbok Kim <address@hidden> <address@hidden>
-Aleksandar Markovic <address@hidden> <address@hidden>
-Aleksandar Markovic <address@hidden> <address@hidden>
-Paul Burton <address@hidden> <address@hidden>
-Paul Burton <address@hidden> <address@hidden>
-Paul Burton <address@hidden> <address@hidden>
 Thiemo Seufer <address@hidden> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <address@hidden> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
@@ -32,6 +24,15 @@ Ian McKellar <address@hidden> Ian McKellar via Qemu-devel 
<qemu-devel@nongnu
 Julia Suvorova <address@hidden> Julia Suvorova via Qemu-devel <address@hidden>
 Justin Terry (VM) <address@hidden> Justin Terry (VM) via Qemu-devel 
<address@hidden>
 
+# Next, replace old addresses by a more recent one.
+Anthony Liguori <address@hidden> Anthony Liguori <address@hidden>
+James Hogan <address@hidden> <address@hidden>
+Aleksandar Markovic <address@hidden> <address@hidden>
+Aleksandar Markovic <address@hidden> <address@hidden>
+Paul Burton <address@hidden> <address@hidden>
+Paul Burton <address@hidden> <address@hidden>
+Paul Burton <address@hidden> <address@hidden>
+Yongbok Kim <address@hidden> <address@hidden>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
-- 
2.20.1