MAINTAINERS: update ndesaulniers

I'm coming back.  I will return.  I will possess your body, and I'll
make LKML burn.

Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/.mailmap b/.mailmap
index e7e639aeb23cf22d754e61ecd6b9b73ef0693c45..833ccaa583d61aeaae4faf3a3d551e2bc6d2d36a 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -642,7 +642,6 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
 Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
 Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
 Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
-Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>
 Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
 Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst
index 34e00848e0dace14423b3babf1c86840f60f053f..d07f16c3c7b82a414a816d063853cd5c8d51c95e 100644 (file)
--- a/Documentation/process/embargoed-hardware-issues.rst
+++ b/Documentation/process/embargoed-hardware-issues.rst
@@ -308,7 +308,7 @@ an involved disclosed party. The current ambassadors list:
 
   Google       Kees Cook <keescook@chromium.org>
 
-  LLVM         Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
+  LLVM         Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
 
 If you want your organization to be added to the ambassadors list, please

diff --git a/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst b/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
index 9d444b9c46d39c801cc761400801b9eca88bbae1..7d4d694967c7369141b41186343c0443e28d41f2 100644 (file)
--- a/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
+++ b/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
@@ -287,7 +287,7 @@ revelada involucrada. La lista de embajadores actuales:
 
   Google       Kees Cook <keescook@chromium.org>
 
-  LLVM         Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
+  LLVM         Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
 
 Si quiere que su organización se añada a la lista de embajadores, por

diff --git a/MAINTAINERS b/MAINTAINERS
index 4a8b0fd665ce2447c3e89784b142d998f7384b95..57a7aef5d8cfdc137b07553479f4ebfa7d88eca1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6342,7 +6342,7 @@ F:        .clang-format
 
 CLANG/LLVM BUILD SUPPORT
 M:     Nathan Chancellor <nathan@kernel.org>
-R:     Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
+R:     Nick Desaulniers <ndesaulniers@google.com>
 R:     Bill Wendling <morbo@google.com>
 R:     Justin Stitt <justinstitt@google.com>
 L:     llvm@lists.linux.dev