Update the email address for Bjorn's maintainer entries and fill in .mailmap accordingly. Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> --- .mailmap | 3 +++ MAINTAINERS | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 23241db2647f..521ecdb8aa67 100644 --- a/.mailmap +++ b/.mailmap @@ -71,6 +71,9 @@ Ben M Cahill <ben.m.cahill@xxxxxxxxx> Ben Widawsky <bwidawsk@xxxxxxxxxx> <ben@xxxxxxxxxxxx> Ben Widawsky <bwidawsk@xxxxxxxxxx> <ben.widawsky@xxxxxxxxx> Ben Widawsky <bwidawsk@xxxxxxxxxx> <benjamin.widawsky@xxxxxxxxx> +Bjorn Andersson <andersson@xxxxxxxxxx> <bjorn@xxxxxxx> +Bjorn Andersson <andersson@xxxxxxxxxx> <bjorn.andersson@xxxxxxxxxx> +Bjorn Andersson <andersson@xxxxxxxxxx> <bjorn.andersson@xxxxxxxxxxxxxx> Björn Steinbrink <B.Steinbrink@xxxxxx> Björn Töpel <bjorn@xxxxxxxxxx> <bjorn.topel@xxxxxxxxx> Björn Töpel <bjorn@xxxxxxxxxx> <bjorn.topel@xxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index f69a1c5212bd..766037b30806 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2579,7 +2579,7 @@ W: http://www.armlinux.org.uk/ ARM/QUALCOMM SUPPORT M: Andy Gross <agross@xxxxxxxxxx> -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> R: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx> L: linux-arm-msm@xxxxxxxxxxxxxxx S: Maintained @@ -8941,7 +8941,7 @@ F: include/linux/hw_random.h HARDWARE SPINLOCK CORE M: Ohad Ben-Cohen <ohad@xxxxxxxxxx> -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> R: Baolin Wang <baolin.wang7@xxxxxxxxx> L: linux-remoteproc@xxxxxxxxxxxxxxx S: Maintained @@ -16134,7 +16134,7 @@ F: drivers/gpio/gpio-sama5d2-piobu.c F: drivers/pinctrl/pinctrl-at91* PIN CONTROLLER - QUALCOMM -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> L: linux-arm-msm@xxxxxxxxxxxxxxx S: Maintained F: Documentation/devicetree/bindings/pinctrl/qcom,*.txt @@ -16827,7 +16827,7 @@ F: Documentation/devicetree/bindings/media/*camss* F: drivers/media/platform/qcom/camss/ QUALCOMM CLOCK DRIVERS -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> L: linux-arm-msm@xxxxxxxxxxxxxxx S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git @@ -17316,7 +17316,7 @@ S: Supported F: fs/reiserfs/ REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> M: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx> L: linux-remoteproc@xxxxxxxxxxxxxxx S: Maintained @@ -17329,7 +17329,7 @@ F: include/linux/remoteproc.h F: include/linux/remoteproc/ REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM -M: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> +M: Bjorn Andersson <andersson@xxxxxxxxxx> M: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx> L: linux-remoteproc@xxxxxxxxxxxxxxx S: Maintained -- 2.35.1