mailmap/gitdm: more fixes for bad tags and authors

I was running some historical tags for the last 10 years and got the
following warnings:

  git log --use-mailmap --numstat --since "June 2010" | ~/src/gitdm.git/gitdm -n -l 5
  [email protected] is an author name, probably not what you want
  bad utf-8 ('utf-8' codec can't decode byte 0xe4 in position 552: invalid continuation byte) in patchm skipping
  bad utf-8 ('utf-8' codec can't decode byte 0xe4 in position 342: invalid continuation byte) in patchm skipping
  [email protected]  is an author name, probably not what you want
  Oops...funky email nicta.com.au
  bad utf-8 ('utf-8' codec can't decode byte 0xe9 in position 232: invalid continuation byte) in patchm skipping
  Oops...funky email andreas.faerber
  Grabbing changesets...done
  Processed 76422 csets from 1902 developers

The following fixes try and alleviate that although I still get a
warning for Aaron which I think is from 9743cd5.

Signed-off-by: Alex Bennée <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Aaron Larson <[email protected]>
Acked-by: Michael Ellerman <[email protected]>
Cc: Andreas Färber <[email protected]>
Cc: Jason Wang <[email protected]>

.mailmap

@@ -28,7 +28,11 @@ Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
 # Corrupted Author fields
+Aaron Larson <[email protected]> [email protected]
+Andreas Färber <[email protected]> Andreas Färber <andreas.faerber>
+Jason Wang <[email protected]> Jason Wang <jasowang>
 Marek Dolata <[email protected]> [email protected] <[email protected]>
+Michael Ellerman <[email protected]> [email protected] <[email protected]>
 Nick Hudson <[email protected]> [email protected] <[email protected]>
 
 # There is also a:
@@ -70,6 +74,7 @@ Yongbok Kim <[email protected]> <[email protected]>
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
 Aaron Lindsay <[email protected]>
+Aaron Larson <[email protected]>
 Alexey Gerasimenko <[email protected]>
 Alex Chen <[email protected]>
 Alex Ivanov <[email protected]>
@@ -144,6 +149,7 @@ Pan Nengyuan <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
+Peter Chubb <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>

contrib/gitdm/aliases

@@ -34,8 +34,10 @@ malc@c046a42c-6fe2-441c-8c8c-71466251a162 [email protected]
 # canonical emails
 [email protected] [email protected]
 
-# some broken tags
+# some broken DCO tags
 yuval.shaia.ml.gmail.com [email protected]
+jasowang [email protected]
+nicta.com.au [email protected]
 
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>