summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mayer <markus.mayer@broadcom.com>2026-10-22 14:19:48 -0700
committerAndrew Morton <akpm@linux-foundation.org>2026-10-24 00:46:51 -0700
commitbd15b1a295fe65aee66c8feb06ccfe33dd2f5617 (patch)
tree4f99a5adbf304c076caa510a6d6c0b148216b62f
parente2e6b2457d11397d5759dcc99fde94e82db5e777 (diff)
MAINTAINERS: update Markus's e-mail address
Classic Broadcom e-mail addresses were recently phased out. Update MAINTAINERS to the new format. Also add an entry to .mailmap for said address. Finally, since I am already touching .mailmap, I may as well map an ancient Linaro address, as well. Link: https://lore.kernel.org/20261022211949.42939-1-markus.mayer@broadcom.com Signed-off-by: Markus Mayer <markus.mayer@broadcom.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Alexander Sverdlin <alex@sverdlin.org> Cc: Chuck Lever <cel@kernel.org> Cc: Martin Kepplinger <martink@posteo.de>
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS8
2 files changed, 6 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index ebb7d13b996f..876ca846cfe3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -597,6 +597,8 @@ Marek Lindner <marek.lindner@mailbox.org> <lindner_marek@yahoo.de>
Marek Lindner <marek.lindner@mailbox.org> <mareklindner@neomailbox.ch>
Mark Brown <broonie@sirena.org.uk>
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
+Markus Mayer <markus.mayer@broadcom.com> <mmayer@broadcom.com>
+Markus Mayer <markus.mayer@broadcom.com> <markus.mayer@linaro.org>
Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
Martin K. Petersen <mkp@kernel.org> <martin.petersen@oracle.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index bd6619bc107d..f81d581bdbf8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5296,7 +5296,7 @@ F: Documentation/devicetree/bindings/usb/brcm,bdc.yaml
F: drivers/usb/gadget/udc/bdc/
BROADCOM BMIPS CPUFREQ DRIVER
-M: Markus Mayer <mmayer@broadcom.com>
+M: Markus Mayer <markus.mayer@broadcom.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-pm@vger.kernel.org
S: Maintained
@@ -5571,7 +5571,7 @@ F: drivers/spi/spi-brcmstb-qspi.c
F: drivers/spi/spi-iproc-qspi.c
BROADCOM STB AVS CPUFREQ DRIVER
-M: Markus Mayer <mmayer@broadcom.com>
+M: Markus Mayer <markus.mayer@broadcom.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-pm@vger.kernel.org
S: Maintained
@@ -5579,7 +5579,7 @@ F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
F: drivers/cpufreq/brcmstb*
BROADCOM STB AVS TMON DRIVER
-M: Markus Mayer <mmayer@broadcom.com>
+M: Markus Mayer <markus.mayer@broadcom.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-pm@vger.kernel.org
S: Maintained
@@ -5587,7 +5587,7 @@ F: Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
F: drivers/thermal/broadcom/brcmstb*
BROADCOM STB DPFE DRIVER
-M: Markus Mayer <mmayer@broadcom.com>
+M: Markus Mayer <markus.mayer@broadcom.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained