diff options
| author | Linus Torvalds <[email protected]> | 2022-05-08 11:01:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-05-08 11:01:20 -0700 |
| commit | ede4c6d78a32f9b7dfdb12d5edf8c8c4c84c729a (patch) | |
| tree | 5e5d1c62f70f36f59a7a833a6e35fd50aa4ba112 | |
| parent | 1f8c5dff000d96b66273a0bf57dbf4d505c730cc (diff) | |
| parent | 60cc5468daaefc18ffc081dc484bdaa1bd270561 (diff) | |
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 <[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 9d47c5e7c6ae..309dd16a079f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8112,7 +8112,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]> S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core |