From 9f19f7ca3e3cbca85360c7af6667d7d0a42d83fc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 11 Oct 2021 22:18:54 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for gabrielschulhof

---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 6131628663e719..ea3fae1ae350f9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -148,6 +148,7 @@ Franziska Hinkelmann <franziska.hinkelmann@gmail.com> <fhinkel@vt.edu>
 Friedemann Altrock <frodenius@gmail.com>
 Fuji Goro <gfuji@cpan.org>
 Gabriel de Perthuis <g2p.code@gmail.com>
+Gabriel Schulhof <gabrielschulhof@gmail.com> <gabriel.schulhof@intel.com>
 Gareth Ellis <gareth.ellis@uk.ibm.com> <gareth@gsellis.com>
 Garwah Lam <garwahlam@gmail.com>
 garygsc <garygsc@gmail.com> <GaryGSC@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index 6e41a10e63241c..98d3796f357e9d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1430,7 +1430,7 @@ Ahmad Nassri <ahmad@ahmadnassri.com>
 Tobias Nießen <tniessen@tnie.de>
 Joseph Gentle <me@josephg.com>
 Arunesh Chandra <arunesh.chandra@microsoft.com>
-Gabriel Schulhof <gabriel.schulhof@intel.com>
+Gabriel Schulhof <gabrielschulhof@gmail.com>
 Ian Halliday <ianhall@microsoft.com>
 Sampson Gao <sampsong@ca.ibm.com>
 Taylor Woll <taylor.woll@microsoft.com>
@@ -3213,7 +3213,6 @@ Dawid Rusnak <dawid@drcode.pl>
 obi-el <elobiobinna@gmail.com>
 Merlin Luntke <22600241+Luntke@users.noreply.github.com>
 Marko Kaznovac <kaznovac@users.noreply.github.com>
-Gabriel Schulhof <gabrielschulhof@gmail.com>
 Ian Kerins <ianskerins@gmail.com>
 dbachko <dbachko@gmail.com>
 Mattias Buelens <mattias@buelens.com>