From 3766cf481e760ceced7807d864a2fcf082151b85 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 18 May 2017 10:41:30 -0700
Subject: [PATCH] .mailmap: Add entries for inconsistent users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Where the same user had multiple entries, I mostly went with whichever
entry had the most-recent non-merge commits.  Before this commit:

  $ git shortlog -se
   ...
     6  Aleksa Sarai <asarai@suse.de>
     2  Aleksa Sarai <cyphar@cyphar.com>
     6  Alexander Morozov <lk4d4@docker.com>
    12  Alexander Morozov <lk4d4math@gmail.com>
     1  Amit Saha <amitsaha.in@gmail.com>
     1  Amit Saha <amitsaha@users.noreply.github.com>
     6  Antonio Murdaca <runcom@linux.com>
     2  Antonio Murdaca <runcom@redhat.com>
     8  Brandon Philips <brandon.philips@coreos.com>
     6  Brandon Philips <brandon@ifup.co>
    18  Brandon Philips <brandon@ifup.org>
   ...
     1  Daniel Dao <dqminh89@gmail.com>
    19  Daniel, Dao Quang Minh <dqminh89@gmail.com>
   ...
    14  Doug Davis <dug@us.ibm.com>
     1  Doug Davis <duglin@users.noreply.github.com>
   ...
     1  John Howard <John.Howard@microsoft.com>
     9  John Howard <jhoward@microsoft.com>
   ...
     1  Liang Chenye <liangchenye@huawei.com>
   ...
     1  Mrunal Patel <mrunal@Mrunals-iMac.local>
     1  Mrunal Patel <mrunal@dhcp-16-185.sjc.redhat.com>
   174  Mrunal Patel <mrunal@me.com>
    31  Mrunal Patel <mrunalp@gmail.com>
   ...
   171  Vincent Batts <vbatts@hashbangbash.com>
     5  Vincent Batts <vbatts@redhat.com>
   ...
     5  Vish Kannan <vishh@users.noreply.github.com>
     1  Vishnu Kannan <vishnuk@google.com>
     5  Vishnu kannan <vishnuk@google.com>
   ...
     1  Zefan Li <lizefan@huawei.com>
     1  Zefan Li <lizf1984@hotmail.com>
   ...
     1  liangchenye <liangchenye@huawei.com>
   ...
     5  v1.0.0.batts <vbatts@hashbangbash.com>
   ...
     1  梁辰晔 (Liang Chenye) <liangchenye@huawei.com>

With Liang, I went with the version that also included the logograms,
because logograms are cool and it matches his GitHub name [1] ;).

The order is alphabetical according to Emacs' sort-lines.

Details on the format in git-shortlog(1).

[1]: https://github.com/liangchenye

Signed-off-by: W. Trevor King <wking@tremily.us>
---
 .mailmap | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..9b63f5895
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,20 @@
+Aleksa Sarai <cyphar@cyphar.com> <asarai@suse.de>
+Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
+Amit Saha <amitsaha.in@gmail.com> <amitsaha@users.noreply.github.com>
+Antonio Murdaca <runcom@linux.com> <runcom@redhat.com>
+Brandon Philips <brandon@ifup.org> <brandon.philips@coreos.com>
+Brandon Philips <brandon@ifup.org> <brandon@ifup.co>
+ChengTiesheng <chengtiesheng@huawei.com>
+Daniel, Dao Quang Minh <dqminh89@gmail.com>
+Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+John Howard <jhoward@microsoft.com> <John.Howard@microsoft.com>
+LinZhinan(Zen Lin) <linzhinan@huawei.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@Mrunals-iMac.local>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@dhcp-16-185.sjc.redhat.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@me.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@hashbangbash.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@redhat.com>
+Vishnu Kannan <vishnuk@google.com>
+Vishnu Kannan <vishnuk@google.com> <vishh@users.noreply.github.com>
+Zefan Li <lizefan@huawei.com> <lizf1984@hotmail.com>
+梁辰晔 (Liang Chenye) <liangchenye@huawei.com>