Merge tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux...

This pull request contains Broadcom SoC MAINTAINERS file entries and
.mailmap updates for 5.13, please pull the following:

- Nicolas updates his maintainer email to a kernel.org address for
  continuity

* tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux:
  mailmap: Update email address for Nicolas Saenz
  MAINTAINERS: Update BCM2711/BCM2335 maintainer's mail

Link: https://lore.kernel.org/r/20210409175018.3051283-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/.mailmap b/.mailmap
index 85b93cd..f2c1a87 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -255,6 +255,8 @@ Nguyen Anh Quynh <aquynh@gmail.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>
+Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
+Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
 Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
 Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
 Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 54661f5..3c04d73 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3371,7 +3371,7 @@ F:        include/linux/dsa/brcm.h
 F:     include/linux/platform_data/b53.h
 
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
-M:     Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+M:     Nicolas Saenz Julienne <nsaenz@kernel.org>
 L:     bcm-kernel-feedback-list@broadcom.com
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)