diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-08 11:01:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-08 11:01:20 -0700 |
| commit | ede4c6d78a32f9b7dfdb12d5edf8c8c4c84c729a (patch) | |
| tree | 5e5d1c62f70f36f59a7a833a6e35fd50aa4ba112 | |
| parent | 1f8c5dff000d96b66273a0bf57dbf4d505c730cc (diff) | |
| parent | 60cc5468daaefc18ffc081dc484bdaa1bd270561 (diff) | |
| download | linux-ede4c6d78a32f9b7dfdb12d5edf8c8c4c84c729a.tar.bz2 | |
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
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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> diff --git a/MAINTAINERS b/MAINTAINERS index 9d47c5e7c6ae..309dd16a079f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |