MAINTAINERS, .mailmap: Update mail address for Nicolas Schier

Update kbuild entry by my kernel.org address, and change my mailmap
entry appropriately.

Acked-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Nicolas Schier <nsc@kernel.org>

diff --git a/.mailmap b/.mailmap
index c371ba3fb8457338c266a29a5980b90eeddfbb72..de53572512da8738dc777f4bfbfe33bbce0a3da6 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -586,8 +586,8 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
-Nicolas Schier <nicolas.schier@linux.dev> <n.schier@avm.de>
-Nicolas Schier <nicolas.schier@linux.dev> <nicolas@fjasle.eu>
+Nicolas Schier <nsc@kernel.org> <n.schier@avm.de>
+Nicolas Schier <nsc@kernel.org> <nicolas@fjasle.eu>
 Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
 Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
 Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 545a4776795e672cde60944f70cb13e95343eacb..1ac6e0f9e5f743eb3370acfa70614411c8a7a7cb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13483,7 +13483,7 @@ F:      fs/autofs/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:     Nathan Chancellor <nathan@kernel.org>
-M:     Nicolas Schier <nicolas@fjasle.eu>
+M:     Nicolas Schier <nsc@kernel.org>
 L:     linux-kbuild@vger.kernel.org
 S:     Odd Fixes
 Q:     https://patchwork.kernel.org/project/linux-kbuild/list/