mailmap: Consolidate current and past maintainers

We can't do this in general, but for maintainers we have
the data in AUTHORS.in to use as a source of truth.

This gets rid of several duplicated lines in the generated
AUTHORS file.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/.mailmap b/.mailmap
index edea4562681156d5ee4c5c62f40c007705ad73e2..913395b89c2edcdc6150f111dab6a7341b3bec88 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,10 @@
 <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
 <serge.hallyn@canonical.com> <serue@us.ibm.com>
 <pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
+<cbosdonnat@suse.com> <cedric.bosdonnat@free.fr>
+<mnestratov@virtuozzo.com> <mnestratov@parallels.com>
+<nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com>
+<jyang@redhat.com> <osier@yunify.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -58,9 +62,13 @@ Philipp Hahn <hahn@univention.de>
 Pritesh Kothari <pritesh.kothari@sun.com>
 Wang Yufei (James) <james.wangyufei@huawei.com>
 Deepak C Shetty <dpkshetty@gmail.com>
+Dave Allan <dallan@redhat.com>
+Richard W.M. Jones <rjones@redhat.com>
 
 # Non-trivial consolidation:
 # see git documentation for information about the format
 Daniel P. Berrangé <berrange@redhat.com>
 Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
+Michal Prívozník <mprivozn@redhat.com>
+Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
 Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>