diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..cc6d51051
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,69 @@
+BAI Yuan	<bybai@cn.ibm.com>
+Bruce Potter	<bp@us.ibm.com>
+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>
+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>
+GAO Feng	<gfgaogf@cn.ibm.com>
+GAO Ling	<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>
+JIN Jie Hua	<jinjhua@cn.ibm.com>
+JIN Jie Hua	<jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+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>
+Linda O. Mellor	<mellor@us.ibm.com>
+Lissa Valletta	<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>
+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>
+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>
+WANG Jun Xia	<junxiaw@cn.ibm.com>
+WANG Xiao Peng	<wxp@cn.ibm.com>
+WANG Xiao Peng	<wxp@cn.ibm.com>	<daniceexi@163.com>
+WANG Xiao Peng	<wxp@cn.ibm.com>	<daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+WANG Xiao Peng	<wxp@cn.ibm.com>	<daniceexi@users.noreply.github.com>
+WANG Xiao Peng	<wxp@cn.ibm.com>	<root@idplex02.(none)>
+WU Xian		<xwuxwu@cn.ibm.com>
+XU Bin		<bxuxa@cn.ibm.com>
+XU Bin		<bxuxa@cn.ibm.com>	<robin.hsu@163.com>
+XU Qing		<qxuqxu@cn.ibm.com>
+XU Qing		<qxuqxu@cn.ibm.com>	<xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+XU Wei		<xwbj@cn.ibm.com>
+YANG Peng	<ypbj@cn.ibm.com>
+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>
+ZHAO Er Tao	<ertaozh@cn.ibm.com>
+ZHAO Er Tao	<ertaozh@cn.ibm.com>	<ertaozh@cn.ibm.comls>
+ZHAO Er Tao	<ertaozh@cn.ibm.com>	<zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>