From 10776d54a6f7db8b4ed107887b9963a697b77edc Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Tue, 4 Jul 2017 13:42:49 +0100
Subject: [PATCH] Update mailmap, and fix some of the entries

---
 .mailmap | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/.mailmap b/.mailmap
index 32bea28b6..d01484002 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,51 +1,65 @@
-Arif Ali <mail@arif-ali.co.uk>
-Arif Ali <mail@arif-ali.co.uk> <arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Andy Wray	<awray@lenovo.com>
+Andy Wray	<awray@lenovo.com>	<andywray@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Arif Ali	<mail@arif-ali.co.uk>
+Arif Ali	<mail@arif-ali.co.uk>	<arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Arif Ali	<mail@arif-ali.co.uk>	<arif-ali@users.noreply.github.com>
 BAI Yuan	<bybai@cn.ibm.com>
+Bill Wajda	<billwajda@hotmail.com>	<billwajda@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Bill Wajda	<billwajda@hotmail.com>
+Brian Elliott Finley	<brian@thefinleys.com>	<brianfinley@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Brian Elliott Finley	<brian@thefinleys.com>
 Bruce Potter	<bp@us.ibm.com>
-CAO Li		<caoli@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Bruce Potter	<bp@us.ibm.com>	<bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+CAO Li	<caoli@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 CAO Meng Meng	<bjcaomm@cn.ibm.com>
-CAO Meng Meng	<caomengmeng@users.noreply.github.com>
-CAO Meng Meng	<caomengmeng_1011@sina.com>
+CAO Meng Meng	<bjcaomm@cn.ibm.com>	<caomengmeng@users.noreply.github.com>
+CAO Meng Meng	<bjcaomm@cn.ibm.com>	<caomengmeng_1011@sina.com>
 Casandra Qiu	<cxhong@us.ibm.com>	<abcdqiu@gmail.com>
 Casandra Qiu	<cxhong@us.ibm.com>
 CHENG Long	<chenglch@cn.ibm.com>
 CHU De Gao	<degaochu@cn.ibm.com>	<chudegao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 CHU De Gao	<degaochu@cn.ibm.com>
 CHU De Gao	<degaochu@cn.ibm.com>	<degaochu@ibm.com.cn>
+Chuck Brazie	<brazie@us.ibm.com>
+Chuck Brazie	<brazie@us.ibm.com>	<chuckbrazie@users.noreply.github.com>
+Chuck Brazie	<brazie@us.ibm.com>	<cbrazie@stny.rr.com>
 GAO Feng	<gfgaogf@cn.ibm.com>
-GAO Ling	<linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+GAO Ling	<linggao@us.ibm.com>	<linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 GAO Ling	<linggao@us.ibm.com>
 GONG Jie	<gongjie@cn.ibm.com>
 GONG Jie	<gongjie@cn.ibm.com>	<gongjie.jie@gmail.com>
 GONG Jie	<gongjie@cn.ibm.com>	<gongjie@linux.vnet.ibm.com>
 HU Wei Hua	<huweihua@cn.ibm.com>
 Jarrod Johnson	<jarrod.b.johnson@gmail.com>
-Jarrod Johnson	<jbjohnso@us.ibm.com>
-Jarrod Johnson	<jjohnson2@buildabear.labs.lenovo.com>
-Jarrod Johnson	<jjohnson2@lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jbjohnso@us.ibm.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jjohnson2@buildabear.labs.lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jjohnson2@lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 JIN Jie Hua	<jinjhua@cn.ibm.com>
-JIN Jie Hua	<jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+JIN Jie Hua	<jinjhua@cn.ibm.com>	<jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+John Dunham	<jdunham@us.ibm.com>
 LI Guang Cheng	<liguangc@cn.ibm.com>
 LI Guang Cheng	<liguangc@cn.ibm.com>	<ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 LI Guang Cheng	<liguangc@cn.ibm.com>	<ligc@cn.ibm.com>
 LI Ting Ting	<litingt@cn.ibm.com>
-Linda O. Mellor	<mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+LI Ting Ting	<litingt@cn.ibm.com>	<root@c910f02c07p02.(none)>
+Linda O. Mellor	<mellor@us.ibm.com>	<mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Linda O. Mellor	<mellor@us.ibm.com>
-Lissa Valletta	<lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Lissa Valletta	<lissav@us.ibm.com>	<lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Lissa Valletta	<lissav@us.ibm.com>
 Mark Gurevich	<gurevich@us.ibm.com>
 Mark Gurevich	<gurevich@us.ibm.com>	<gurevich@c910loginx01.(none)>
-Norm Nott	<nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Norm Nott	<nott@us.ibm.com>
+Norm Nott	<nott@us.ibm.com>	<nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Patrick Lundgren	<plundgr@us.ibm.com>
 Patrick Lundgren	<plundgr@us.ibm.com>	<pdlun92@gmail.com>
 Patrick Lundgren	<plundgr@us.ibm.com>	<plundgr@c910loginx01.(none)>
-SUN Jing	<sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 SUN Jing	<sjing@cn.ibm.com>
+SUN Jing	<sjing@cn.ibm.com>	<sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Victor Hu	<vhu@us.ibm.com>
 Victor Hu	<vhu@us.ibm.com>	<vhu@victorvm7.pok.ibm.com>
 Victor Hu	<vhu@us.ibm.com>	<whowutwut@gmail.com>
-WANG Hua Zhong	<wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+WANG Hua Zhong	<wanghuaz@cn.ibm.com>	<wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 WANG Hua Zhong	<wanghuaz@cn.ibm.com>
 WANG Jun Xia	<junxiaw@cn.ibm.com>
 WANG Xiao Peng	<wxp@cn.ibm.com>
@@ -64,7 +78,7 @@ YANG Song	<yangsbj@cn.ibm.com>
 YANG Song	<yangsbj@cn.ibm.com>	<immarvin@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 YANG Song	<yangsbj@cn.ibm.com>	<immarvin@users.noreply.github.com>
 YANG Song	<yangsbj@cn.ibm.com>	<yangsbj@cn.ibm.comq>
-YIN Le		<yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+YIN Le		<yinle@cn.ibm.com>	<yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 YIN Le		<yinle@cn.ibm.com>
 ZHAO Er Tao	<ertaozh@cn.ibm.com>
 ZHAO Er Tao	<ertaozh@cn.ibm.com>	<ertaozh@cn.ibm.comls>