Commit ede4c6d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull locking fixlet from Thomas Gleixner:
 "Just a email address update for MAINTAINERS and mailmap"

* tag 'locking-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: MAINTAINERS, .mailmap: Update André's email address
parents 1f8c5dff 60cc5468

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com> 
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8112,7 +8112,7 @@ M: Ingo Molnar <mingo@redhat.com> 
R:	Peter Zijlstra <peterz@infradead.org>

R:	Darren Hart <dvhart@infradead.org>

R:	Davidlohr Bueso <dave@stgolabs.net>

R:	André Almeida <andrealmeid@collabora.com>

R:	André Almeida <andrealmeid@igalia.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core