Commit Graph

150 Commits

Author SHA1 Message Date
Erik Faye-Lund
e6d487792e mailmap: update rohan's primary email address
Rohan has been working for Intel for a while, so let's make that his
primary email address.

Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
9cb82944e9 mailmap: use consistent spelling for constantine
Reviewed-by: Constantine Shablia <constantine.shablya@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
926c7d67c4 mailmap: move konstantin to the right sorted position
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
bc6fe203a7 mailmap: map collabora.co.uk to collabora.com
Gert has committed using both the com and co.uk email address. They lead
to the same inbox, but let's make sure they get counted as one
contributor in the git history.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
f3e0cc5c30 mailmap: invert my mailmapping
I first and foremostly work on Mesa as a Collabora employee, so it's
clearer if my gmail address map to my collabora address instead of the
other way around.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
df713647bc mailmap: merge Robert and Bob Beckett into one
This is the same person, and he usually goes by Bob. Let's merge this
into one, so the commits gets counted together.

Reviewed-by: Bob Beckett <bob.beckett@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:15 +00:00
Erik Faye-Lund
3c259f5cac mailmap: invert tomeu's mapping
Tomeu hasn't been working at Collabora for a while now, let's invert the
mapping so his private email address is more prominent.

Reviewed-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29240>
2024-06-19 09:06:14 +00:00
David Heidelberg
a77d953e20 mailmap: update my email
Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29511>
2024-06-01 18:25:28 +00:00
Karmjit Mahil
6825fc48f5 mailmap: Add Karmjit Mahil
Signed-off-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29374>
2024-05-30 05:55:11 +00:00
Eric Engestrom
dc3bc70899 .mailmap: fix email address for @cpmichael
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29437>
2024-05-28 16:31:23 +00:00
Eric Engestrom
390ac5ba14 mailmap: add entry to unify Roman Stratiienko's contributions
$ git shortlog -sne --author 'Roman Stratiienko'
  65  Roman Stratiienko <r.stratiienko@gmail.com>
   7  Roman Stratiienko <roman.stratiienko@globallogic.com>
   4  Roman Stratiienko <roman.o.stratiienko@globallogic.com>
   3  Roman Stratiienko <roman.stratiienko@nure.ua>

Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29237>
2024-05-16 12:05:27 +00:00
David Heidelberg
74ea0d006e mailmap: add Freya Gentz entry
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9989>
2024-05-11 19:43:47 +00:00
Andres Gomez
14782cf248 .mailmap: add an alias for Christian Gmeiner
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23498>
2023-06-08 09:16:25 +00:00
Lucas Fryzek
811ac6e393 mailmap: Add Lucas Fryzek to mailmap
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23499>
2023-06-07 15:47:40 +00:00
Andres Gomez
67cd3da63e .mailmap: add an alias for Clayton Craft
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Clayton Craft <clayton@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15260>
2023-06-07 14:38:41 +00:00
Andres Gomez
d76aaf1f4d .mailmap: add an alias for Miguel Casas-Sanchez
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15260>
2023-06-07 14:38:41 +00:00
Eric Engestrom
7ae6932d47 mailmap: update @mupuf's name
There were a number of variants in the git history:

    Martin Peres <martin.peres@linux.intel.com>
    Martin Peres <martin.peres@mupuf.org>
    Martin Roukala (néé Peres) <martin.roukala@mupuf.org>
    Martin Roukala (né Peres) <martin.roukala@mupuf.org>

Last one is the current one, so let's normalize the rest to that.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23229>
2023-05-25 09:07:59 +00:00
Alyssa Rosenzweig
e3105f93bd mailmap: Update my e-mail
https://rosenzweig.io/blog/passing-reins-panfrost.html

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22399>
2023-04-10 21:54:05 +00:00
Lina Versace
ede5fed450 mailmap: Add Lina's new google.com address
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22153>
2023-03-28 03:37:43 +00:00
Bas Nieuwenhuizen
ad4271439c Update my mailmap aliases
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21998>
2023-03-18 17:19:00 +00:00
Val Packett
9b0c688f51 mailmap: Remap name and email for Val Packett
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21032>
2023-02-01 11:30:12 +00:00
Lina Versace
a429d06878 mailmap: Lina is Chad's new name
If you can longer find chadversary or chadv on the interwebs, then
search for linyaa or versalinyaa.

Egg-crAcked-By: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Egg-Cracked-By: Faith Ekstrand <faith@gfxstrand.net>
Egg-Cracked-By: Lyude Paul <lyude@redhat.com>
Egg-Cracked-By: Wann
Egg-Cracked-By: Zach Lesher
Egg-Cracked-By: 初音ミク
Acked-by: Daniel Stone <daniels@collabora.com>
2023-01-31 18:12:42 -08:00
Faith Ekstrand
03d1141e51 mailmap: Remap e-mail addresses for Faith Ekstrand
Acked-by: Lina Versace <lina@kiwitree.net>
Acked-by: Daniel Stone <daniels@collabora.com>
Lovingly-reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21000>
2023-01-31 01:17:07 +00:00
Konstantin Kharlamov
3eec931e9b .mailmap: change spelling for Constantine Kharlamov
The officially used spelling is Konstantin and I've been using it
everywhere for quite some time, so let's change it here as well

Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17974>
2022-08-12 13:11:03 +00:00
David Heidelberg
3b595bf50f mailmap: fix order of emails for Axel Davy
Reviewed-by: Axel Davy <davyaxel0@gmail.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17698>
2022-07-27 21:36:23 +00:00
Eric Engestrom
10cd9ce606 mailmap: update my email to Igalia
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17461>
2022-07-11 15:03:53 +01:00
Jason Ekstrand
fe71f4d9ec .mailmap: Switch Jason Ekstrand to @collabora.com
Jason is starting at Collabora on the 24th.  More details at
https://www.jlekstrand.net/jason/blog/2022/01/hello-collabora/

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14586>
2022-01-26 20:08:31 +00:00
Caio Oliveira
1fb41193fe .mailmap: Simplify my name
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13651>
2021-11-03 20:48:43 +00:00
Jason Ekstrand
24d2459b02 mailmap: Add two more lines for Alyssa Rosenzweig
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11788>
2021-07-12 23:45:34 +00:00
Jason Ekstrand
dbc5db11e5 mailmap: Update for Emma's new e-mail address
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11788>
2021-07-12 23:45:34 +00:00
Daniel Schürmann
05fb5e85f2 .mailmap: fix email for Daniel Schürmann
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9755>
2021-03-22 18:56:22 +00:00
Andres Gomez
c2e5c35786 .mailmap: add an alias for Eleni Maria Stea
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eleni Maria Stea <elene.mst@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9435>
2021-03-14 14:06:49 +02:00
Andres Gomez
b4d1764b46 .mailmap: resolve duplicates for Yogesh Mohan Marimuthu
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
4752ef5039 .mailmap: resolve duplicates for Satyeshwar Singh
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
8481d5f4d0 .mailmap: resolve duplicates for Mun Gwan-gyeong
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
cc1da67fd1 .mailmap: resolve duplicates for Maya Rashish
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
a3d4c48597 .mailmap: resolve duplicates for Matthias Lorenz
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
abd9b0d7d8 .mailmap: resolve duplicates for Matthias Hopf
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
4fd9f4beb6 .mailmap: resolve duplicates for Mark Menzynski
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
00aefdfea6 .mailmap: resolve duplicates for Lin Johnson
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
028ae10694 .mailmap: resolve duplicates for Jan Zielinski
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
6c9660e424 .mailmap: resolve duplicates for James Xiong
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
64b415d96c .mailmap: resolve duplicates for Indrajit Das
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
75f5fc3435 .mailmap: resolve duplicates for Emmanuel Vadot
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
cd4dfc157b .mailmap: resolve duplicates for Christopher Li
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
9e34049e46 .mailmap: resolve duplicates for Icecream95
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
bd8193fb4c .mailmap: colapse duplicates for Timothy Arceri
Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
2021-03-05 16:35:07 +00:00
Andres Gomez
e476c18196 .mailmap: add and update aliases for Danylo Piliaiev
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7916>
2020-12-04 15:08:30 +00:00
Andres Gomez
bd86399db0 .mailmap: add an alias for Andres Gomez
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4739>
2020-04-30 14:33:20 +03:00
Andres Gomez
3cde4c3a08 .mailmap: add an alias for Iago Toral Quiroga
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4739>
2020-04-30 14:33:20 +03:00