2022-05-09 07:00:11

by Thomas Gleixner

[permalink] [raw]
Subject: [GIT pull] locking/urgent for v5.18-rc6

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 <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrzej Hajda <[email protected]> <[email protected]>
+André Almeida <[email protected]> <[email protected]>
Andy Adamson <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 40fa1955ca3f..35dea3d12981 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8109,7 +8109,7 @@ M: Ingo Molnar <[email protected]>
R: Peter Zijlstra <[email protected]>
R: Darren Hart <[email protected]>
R: Davidlohr Bueso <[email protected]>
-R: André Almeida <[email protected]>
+R: André Almeida <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core