The following commit has been merged into the locking/urgent branch of tip: Commit-ID: 60cc5468daaefc18ffc081dc484bdaa1bd270561 Gitweb: https://git.kernel.org/tip/60cc5468daaefc18ffc081dc484bdaa1bd270561 Author: André Almeida <andrealmeid@xxxxxxxxxx> AuthorDate: Thu, 21 Apr 2022 14:32:54 -03:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 22 Apr 2022 10:30:20 +02:00 futex: MAINTAINERS, .mailmap: Update André's email address Update futex entry to use my new professional email address. Signed-off-by: André Almeida <andrealmeid@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220421173254.29855-1-andrealmeid@xxxxxxxxxx --- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 9345815..ea1ba4a 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 40fa195..35dea3d 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