From 3ea14414ac79bef58f5625c6dccca8f5acb30722 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Wed, 29 May 2024 16:01:55 -0700
Subject: [PATCH] Sync .mailmap from Mesa

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/922>
---
 .mailmap | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index ef4d15786..e3eb8d50e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,9 +41,9 @@ Alex Deucher <alexdeucher@gmail.com> <alex@botch2.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
 
-Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <alyssa@rosenzweig.io>
-Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <a@rosenzweig.io>
-Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <alyssa@collabora.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa.rosenzweig@collabora.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <a@rosenzweig.io>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa@collabora.com>
 
 Andreas Fänger <a.faenger@e-sign.com> <a.faenger@e-sign.com>
 
@@ -68,6 +68,7 @@ Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
 Axel Davy <davyaxel0@gmail.com> <axel.davy@ens.fr>
 
 Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@chromium.org>
+Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@google.com>
 
 Benjamin Franzke <benjaminfranzke@googlemail.com> ben <benjaminfranzke@googlemail.com>
 
@@ -114,12 +115,14 @@ Carl-Philip Hänsch <cphaensch@googlemail.com> <s3734770@mail.zih.tu-dresden.de>
 Carl-Philip Hänsch <cphaensch@googlemail.com> <carli@carli-laptop.(none)>
 Carl-Philip Hänsch <cphaensch@googlemail.com> <Carl-Philip.Haensch@mailbox.tu-dresden.de>
 
-Chad Versace <chadversary@chromium.org> <chad@kiwitree.net>
-Chad Versace <chadversary@chromium.org> <chad@chad-versace.us>
-Chad Versace <chadversary@chromium.org> <Chad Versace chad@chad-versace.us>
-Chad Versace <chadversary@chromium.org> <chad.versace@intel.com>
-Chad Versace <chadversary@chromium.org> <chad.versace@linux.intel.com>
-Chad Versace <chadversary@chromium.org> <chadversary@google.com>
+Lina Versace <lina@kiwitree.net> <chad@kiwitree.net>
+Lina Versace <lina@kiwitree.net> <chad@chad-versace.us>
+Lina Versace <lina@kiwitree.net> <Chad Versace chad@chad-versace.us>
+Lina Versace <lina@kiwitree.net> <chad.versace@intel.com>
+Lina Versace <lina@kiwitree.net> <chad.versace@linux.intel.com>
+Lina Versace <lina@kiwitree.net> <chadversary@google.com>
+Lina Versace <lina@kiwitree.net> <chadversary@chromium.org>
+Lina Versace <lina@kiwitree.net> <linyaa@google.com>
 
 Chandu Babu Namburu <chandu@amd.com>
 Chandu Babu Namburu <chandu@amd.com> <mailto:chandu@amd.com>
@@ -131,7 +134,8 @@ Chia-I Wu <olvaffe@gmail.com> Chia-Wu <olvaffe@gmail.com>
 
 Chih-Wei Huang <cwhuang@linux.org.tw> Chih-Wei Huang <cwhuang@android-x86.org>
 
-Christian Gmeiner <christian.gmeiner@gmail.com> <christian.GMEINER@bachmann.info>
+Christian Gmeiner <cgmeiner@igalia.com> <christian.gmeiner@gmail.com>
+Christian Gmeiner <cgmeiner@igalia.com> <christian.GMEINER@bachmann.info>
 
 Christian Inci <chris.bugsfd@broke-the-inter.net> <chris.pcguy.inci@gmail.com>
 
@@ -153,9 +157,14 @@ Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Christop
 Christopher Li <chrisl@vmware.com> Chris Li <chrisl@vmware.com>
 Christopher Li <chrisl@vmware.com> Qicheng Christopher Li <chrisl@vmware.com>
 
+Christopher Michael <cmichael@igalia.com> <devilhorns@comcast.net>
+
 Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
 Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>
 
+Clayton Craft <clayton@igalia.com> <clayton.a.craft@intel.com>
+Clayton Craft <clayton@igalia.com> <clayton@craftyguy.net>
+
 Colin McDonald <cjmmail10-bz@yahoo.co.uk> <cjmcdonald@qinetiq.com>
 
 Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
@@ -239,6 +248,8 @@ Frank Binns <frank.binns@imgtec.com> <francisbinns@gmail.com>
 
 Frank Henigman <fjhenigman@google.com> <fjhenigman@chromium.org>
 
+Freya Gentz <zegentzy@protonmail.com>
+
 George Sapountzis <gsapountzis@gmail.com> George Sapountzis <gsap7@yahoo.gr>
 
 Gert Wollny <gert.wollny@collabora.com> <gw.fossdev@gmail.com>
@@ -399,6 +410,8 @@ Lionel Landwerlin <lionel.g.landwerlin@intel.com> <llandwerlin@gmail.com>
 
 Liviu Prodea <liviuprodea@yahoo.com>
 
+Lucas Fryzek <lfryzek@igalia.com> <lucas.fryzek@gmail.com>
+
 Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
 
 Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
@@ -426,7 +439,10 @@ Mark Mueller <markkmueller@gmail.com> <MarkKMueller@gmail.com>
 
 Marta Lofstedt <marta.lofstedt@intel.com> <marta.lofstedt@linux.intel.com>
 
-Martin Peres <martin.peres@linux.intel.com> <martin.peres@labri.fr>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@mupuf.org>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@linux.intel.com>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@labri.fr>
 
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@gmx.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@web.de>
@@ -467,6 +483,8 @@ Michel Dänzer <michel@daenzer.net> Michel Daenzer <michel.daenzer@amd.com>
 Michel Dänzer <michel@daenzer.net> Michel Daenzer <daenzer@localhost.(none)>
 Michel Dänzer <michel@daenzer.net> <mdaenzer@redhat.com>
 
+Miguel Casas-Sanchez <mcasas@chromium.org> Miguel Casas-Sanchez <miguelecasassanchez@gmail.com>
+
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> Mike Kaplinksiy <mike.kaplinskiy@gmail.com>
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> <mike.kaplinskiy@gmai.com>
 
@@ -562,6 +580,10 @@ Rodrigo Vivi <rodrigo.vivi@intel.com> <rodrigo.vivi@gmail.com>
 Roland Scheidegger <sroland@vmware.com> <rscheidegger@gmx.ch>
 Roland Scheidegger <sroland@vmware.com> <sroland@tungstengraphics.com>
 
+Roman Stratiienko <r.stratiienko@gmail.com> <roman.stratiienko@globallogic.com>
+Roman Stratiienko <r.stratiienko@gmail.com> <roman.o.stratiienko@globallogic.com>
+Roman Stratiienko <r.stratiienko@gmail.com> <roman.stratiienko@nure.ua>
+
 Roy Spliet <rspliet@eclipso.eu> <r.spliet@student.tudelft.nl>
 
 Rune Petersen <rune@megahurts.dk> Rune Peterson <rune@megahurts.dk>
@@ -650,6 +672,8 @@ Török Edwin <edwin+mesa@etorok.net> <edwintorok@gmail.com>
 Vadym Shovkoplias <vadym.shovkoplias@globallogic.com>
 Vadym Shovkoplias <vadym.shovkoplias@globallogic.com> <vadim.shovkoplias@gmail.com>
 
+Val Packett <val@packett.cool> <greg@unrelenting.technology>
+
 Varad Gautam <varad.gautam@collabora.com> <varadgautam@gmail.com>
 
 Ville Syrjälä <ville.syrjala@linux.intel.com> Ville Syrjala <syrjala@freedesktop.org>
-- 
2.11.4.GIT