[GIT pull] locking/urgent for v5.18-rc6

[Thomas Gleixner]

Linus,

please pull the latest locking/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2022-05-08

up to:  60cc5468daae: futex: MAINTAINERS, .mailmap: Update André's email address


Just a email address update for MAINTAINERS and mailmap.

Thanks,

	tglx

------------------>
André Almeida (1):
      futex: MAINTAINERS, .mailmap: Update André's email address


 .mailmap    | 1 +
 MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 93458154ce7d..ea1ba4a9a77e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -45,6 +45,7 @@ Andrey Konovalov <andreyknvl@xxxxxxxxx> <andreyknvl@xxxxxxxxxx>
 Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> <a.ryabinin@xxxxxxxxxxx>
 Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> <aryabinin@xxxxxxxxxxxxx>
 Andrzej Hajda <andrzej.hajda@xxxxxxxxx> <a.hajda@xxxxxxxxxxx>
+André Almeida <andrealmeid@xxxxxxxxxx> <andrealmeid@xxxxxxxxxxxxx>
 Andy Adamson <andros@xxxxxxxxxxxxxx>
 Antoine Tenart <atenart@xxxxxxxxxx> <antoine.tenart@xxxxxxxxxxx>
 Antoine Tenart <atenart@xxxxxxxxxx> <antoine.tenart@xxxxxxxxxxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index 40fa1955ca3f..35dea3d12981 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8109,7 +8109,7 @@ M:	Ingo Molnar <mingo@xxxxxxxxxx>
 R:	Peter Zijlstra <peterz@xxxxxxxxxxxxx>
 R:	Darren Hart <dvhart@xxxxxxxxxxxxx>
 R:	Davidlohr Bueso <dave@xxxxxxxxxxxx>
-R:	André Almeida <andrealmeid@xxxxxxxxxxxxx>
+R:	André Almeida <andrealmeid@xxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core