From: Stefan Beller <sbeller@google.com>
Date: Fri, 29 Jun 2018 02:10:49 GMT
Subject: [PATCH 2/3] .mailmap: assume Jason McMullan to be the same person
Message-ID: <20180629021050.187887-2-sbeller@google.com>
In-Reply-To: <20180629021050.187887-1-sbeller@google.com>

Over the years of contributing to open source, I realized the world of
open source is smaller than I originally thought and a name is still
a pretty unique thing. So let's assume these two author idents are the
same person.

In 10813e0d3c7 (.mailmap: update long-lost friends with multiple defunct
addresses, 2013-08-12) we learned both their email bounce, so asking is
no option.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 .mailmap | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index f165222a782..ff96ef7401f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -82,10 +82,7 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
 James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
-# The 2 following authors are probably the same person,
-# but both emails bounce.
-Jason McMullan <jason.mcmullan@timesys.com>
-Jason McMullan <mcmullan@netapp.com>
+Jason McMullan <jason.mcmullan@timesys.com> Jason McMullan <mcmullan@netapp.com>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
-- 
2.18.0.399.gad0ab374a1-goog