From 9817eddfe0cabf55b1f0045b22433ceb30f38f0e Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@ovn.org>
Date: Fri, 4 Nov 2016 21:22:02 -0400
Subject: [PATCH] Add .mailmap file.

Create a .mailmap file as described in git-shortlog(1).  This is used to
map commits that contain different names or email addresses to the same
person.

This file will automatically be used by git-shortlog.  It can also be
used by other commands, such as git-log by providing the --use-mailmap
option.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---
 .mailmap | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..a5eea0c51
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,74 @@
+Aaron Conole <aconole@redhat.com> <aaron@bytheb.org>
+Aaron Conole <aconole@redhat.com> <aconole@bytheb.org>
+Aaron Rosen <aaronorosen@gmail.com> <arosen@clemson.edu>
+Alex Wang <ee07b291@gmail.com> <alexw@nicira.com>
+Alexey I. Froloff <raorn@raorn.name> <raorn@altlinux.org>
+Alin Serdean <aserdean@cloudbasesolutions.com> <aserdean at cloudbasesolutions.com>
+Alin Serdean <aserdean@cloudbasesolutions.com> Alin Gabriel Sardean <aserdean@cloudbasesolutions.com>
+Andy Zhou <azhou@ovn.org> <azhou@nicira.com>
+Andy Zhou <azhou@ovn.org> <azhou@von.org>
+Andy Zhou <azhou@ovn.org> andy zhou <azhou@ovn.org>
+Ansis Atteka <aatteka@ovn.org> <aatteka@nicira.com>
+Ansis Atteka <aatteka@ovn.org> <ansisatteka@gmail.com>
+Anupam Chanda <achanda@vmware.com> <achanda@nicira.com>
+Ariel Tubaltsev <tubaltzev@gmail.com> <atubaltsev@vmware.com>
+Babu Shanmugam <bschanmu@redhat.com>
+Ben Pfaff <blp@ovn.org> <blp@nicira.com>
+Bruce Davie <bdavie@vmware.com> <bsd@nicira.com>
+Bruce Davie <bdavie@vmware.com> <bdavie@nicira.com>
+Chandra Sekhar Vejendla <csvejend@us.ibm.com>
+Daniele Di Proietto <diproiettod@vmware.com> <daniele.di.proietto@gmail.com>
+Daniele Di Proietto <diproiettod@vmware.com> <ddiproietto@vmware.com>
+Ed Maste <emaste@freebsd.org> <emaste@adaranet.com>
+Ethan J. Jackson <ejj@eecs.berkeley.edu> <ethan@nicira.com>
+Fischetti, Antonio <antonio.fischetti@intel.com>
+Flavio Fernandes <flavio@flaviof.com>
+Flavio Leitner <fbl@sysclose.org> <fbl@redhat.com>
+Gal Sagie <gal.sagie@gmail.com>
+Gurucharan Shetty <guru@ovn.org> <gshetty@nicira.com>
+Gurucharan Shetty <guru@ovn.org> Guru Shetty <guru@ovn.org>
+Henry Mai <hmai@nicira.com> <henrymai@nicira.com>
+Hui Kang <kangh@us.ibm.com> <hkang.sunysb@gmail.com>
+Ian Campbell <ian.campbell@citrix.com> <Ian.Campbell@citrix.com>
+James Page <james.page@ubuntu.com> <roampune@gmail.com>
+Jarno Rajahalme <jarno@ovn.org> <jarno.rajahalme@nsn.com>
+Jarno Rajahalme <jarno@ovn.org> <jrajahalme@nicira.com>
+Jean Tourrilhes <jt@hpl.hp.com> Jean Tourrihles <jt@hpl.hp.com>
+Jean Tourrilhes <jt@hpl.hp.com> <jean.tourrilhes@hp.com>
+Jesse Gross <jesse@kernel.org> <jesse@nicira.com>
+Joe Stringer <joe@ovn.org> <joe@wand.net.nz>
+Joe Stringer <joe@ovn.org> <joestringer@nicira.com>
+Justin Pettit <jpettit@ovn.org> <jpettit@nicira.com>
+Kmindg <kmindg@gmail.com>
+Kyle Mestery <mestery@mestery.com> <kmestery@cisco.com>
+Mauricio Vasquez <mauricio.vasquez@polito.it> <mauricio.vasquezbernal@studenti.polito.it>
+Miguel Angel Ajo <majopela@redhat.com> <mangelajo@redhat.com>
+Neil McKee <neil.mckee@inmon.com>
+Ofer Ben-Yacov <ofer.benyacov@gmail.com>
+Polehn, Mike A <mike.a.polehn@intel.com>
+Pravin B Shelar <pshelar@ovn.org> <pshelar@nicira.com>
+Raju Subramanian <rsubramanian@nicira.com>
+Ralf Spenneberg <ralf@spenneberg.net>
+Rami Rosen <ramirose@gmail.com>
+Ramu Ramamurthy <ramu.ramamurthy@us.ibm.com> <ramu.ramamurthy@gmail.com>
+Robert Åkerblom-Andersson <Robert.nr1@gmail.com> Robert Åkerblom-Andersson <Scorpiion@users.noreply.github.com>
+Romain Lenglet <romain.lenglet@oracle.com> <rlenglet@vmware.com>
+Romain Lenglet <romain.lenglet@oracle.com> <romain.lenglet@berabera.info>
+Russell Bryant <russell@ovn.org> <rbryant@redhat.com>
+Ryan Moats <rmoats@us.ibm.com>
+Sabyasachi Sengupta <Sabyasachi.Sengupta@alcatel-lucent.com> <sabyasachi.sengupta@alcatel-lucent.com>
+Saurabh Shah <ssaurabh@vmware.com> <ssaurabh@nicira.com>
+Shad Ansari <shad.ansar@hpe.com> <shad.ansari@hp.com>
+Shih-Hao Li <shihli@vmware.com> <shli@nicira.com>
+Simon Horman <simon.horman@netronome.com> <horms@verge.net.au>
+Stephen Finucane <stephen@that.guru> <stephen.finucane@intel.com>
+Thomas F. Herbert <thomasfherbert@gmail.com> <thomasfherbert@entpnt.com>
+Thomas Graf <tgraf@noironetworks.com> <tgraf@redhat.com>
+Thomas Graf <tgraf@noironetworks.com> <tgraf@suug.ch>
+Wei Li <liw@dtdream.com>
+YAMAMOTO Takashi <yamamoto@ovn.org> <yamamoto@midokura.com>
+YAMAMOTO Takashi <yamamoto@ovn.org> <yamamoto@valinux.co.jp>
+YAMAMOTO Takashi <yamamoto@ovn.org> <yamt@mwd.biglobe.ne.jp>
+Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> <zwu.kernel@gmail.com>
+Zoltan Kiss <zoltan.kiss@linaro.org> <zoltan.kiss@citrix.com>
+Zong Kai LI <zealokii@gmail.com>
-- 
2.39.2