MAINTAINERS: update email address of Heiko Schocher

use the new email address for community work.

While at it, cleanup git shortlog output, by adding
fixes in .mailmap

Signed-off-by: Heiko Schocher <hs@nabladev.com>

diff --git a/.mailmap b/.mailmap
index 67a42217cf86b09c41b67cbdaffe573841a6699d..f15697ca2dfac4df589db54a9ee5733424236eb2 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -48,6 +48,11 @@ Greg Malysa <malysagreg@gmail.com> <greg.malysa@timesys.com>
 Harini Katakam <harini.katakam@amd.com> <harini.katakam@xilinx.com>
 Harsha <harsha.harsha@amd.com> <harsha.harsha@xilinx.com>
 Heiko Stuebner <heiko.stuebner@cherry.de> <heiko.stuebner@theobroma-systems.com>
+Heiko Schocher <hs@nabladev.com> <hs@denx.de>
+Heiko Schocher <hs@nabladev.com> <hs@pollux.denx.de>
+Heiko Schocher <hs@nabladev.com> <heiko.schocher@invitel.hu>
+Heiko Schocher <hs@nabladev.com> <[hs@denx.de]>
+Heiko Schocher <hs@nabladev.com> <hs@pollux.(none)>
 Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
 Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
 Ibai Erkiaga <ibai.erkiaga-elorza@amd.com> <ibai.erkiaga-elorza@xilinx.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index d6c4587bf866a352551f33bf1c5f217c54ebe884..05291ed1ad0c5b8e7d36dbb2b4f1a663692511b7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1244,7 +1244,7 @@ F:        drivers/misc/gsc.c
 F:     include/gsc.h
 
 I2C
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-i2c.git
 F:     drivers/i2c/
@@ -1498,7 +1498,7 @@ F:        drivers/pci_endpoint/
 F:  include/pci_ep.h
 
 PCI MPC85xx
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     drivers/pci/pci_mpc85xx.c
 
@@ -1795,7 +1795,7 @@ F:        lib/optee
 
 UBI
 M:     Kyungmin Park <kmpark@infradead.org>
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-ubi.git
 F:     drivers/mtd/ubi/

diff --git a/board/aristainetos/MAINTAINERS b/board/aristainetos/MAINTAINERS
index c81bef9cb7c3340dc9e84b257a692c4fdb53ad28..77d7b1614c8a3b07ae81889eecffe9555d7949b8 100644 (file)
--- a/board/aristainetos/MAINTAINERS
+++ b/board/aristainetos/MAINTAINERS
@@ -1,5 +1,5 @@
 ARISTAINETOS BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/aristainetos/
 F:     include/configs/aristainetos2.h

diff --git a/board/bosch/shc/MAINTAINERS b/board/bosch/shc/MAINTAINERS
index 58104cc1318514e3d4e3dee56bacbdd84bc6daa5..a30c672e1d6be2470f2ca1173ee2dd3670739cca 100644 (file)
--- a/board/bosch/shc/MAINTAINERS
+++ b/board/bosch/shc/MAINTAINERS
@@ -1,5 +1,5 @@
 SHC BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/bosch/shc
 F:     include/configs/am335x_shc.h

diff --git a/board/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS
index 8822e5d9155c37f5af0e0279d6b423f934f81c12..af0d6afb2b44843d0c853e13dfc5770fdc4a870e 100644 (file)
--- a/board/keymile/km83xx/MAINTAINERS
+++ b/board/keymile/km83xx/MAINTAINERS
@@ -1,6 +1,6 @@
 KM83XX BOARD
 M:     Holger Brunck <holger.brunck@hitachienergy.com>
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/keymile/km83xx/
 F:     board/keymile/common/

diff --git a/board/siemens/capricorn/MAINTAINERS b/board/siemens/capricorn/MAINTAINERS
index 9c8c7a6ecdcb93b317019ac6bc99c9cb6d84a2f2..6c253983cf06fcd644f96e79d796fd1144131d57 100644 (file)
--- a/board/siemens/capricorn/MAINTAINERS
+++ b/board/siemens/capricorn/MAINTAINERS
@@ -1,6 +1,6 @@
 CAPRICORN BOARD
 M:     Alexander Sverdlin <alexander.sverdlin@siemens.com>
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 M:     Walter Schweizer <walter.schweizer@siemens.com>
 S:     Maintained
 F:     arch/arm/dts/imx8-capricorn-cxg3.dts

diff --git a/board/siemens/corvus/MAINTAINERS b/board/siemens/corvus/MAINTAINERS
index 59176aae575347034d2de920a8b46d83b88b297a..4471cf3ce3c257fc17f98cbcac1cc0d157e49587 100644 (file)
--- a/board/siemens/corvus/MAINTAINERS
+++ b/board/siemens/corvus/MAINTAINERS
@@ -1,5 +1,5 @@
 CORVUS BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/siemens/corvus/
 F:     include/configs/corvus.h

diff --git a/board/siemens/smartweb/MAINTAINERS b/board/siemens/smartweb/MAINTAINERS
index 51298ffb5d6467fd509c1617e5c367d5806f07c4..09d7667241c36df9b81a881e4817b3dab613a4ac 100644 (file)
--- a/board/siemens/smartweb/MAINTAINERS
+++ b/board/siemens/smartweb/MAINTAINERS
@@ -1,5 +1,5 @@
 SMARTWEB_HW BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/siemens/smartweb
 F:     include/configs/smartweb.h

diff --git a/board/siemens/taurus/MAINTAINERS b/board/siemens/taurus/MAINTAINERS
index 74e3518e0d9cf340da2ef5b794ab933d676c5f0c..c17bd51a0de84a19b1c1053ca97f3eab81a7dea1 100644 (file)
--- a/board/siemens/taurus/MAINTAINERS
+++ b/board/siemens/taurus/MAINTAINERS
@@ -1,5 +1,5 @@
 TAURUS BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/siemens/taurus/
 F:     include/configs/taurus.h

diff --git a/board/socrates/MAINTAINERS b/board/socrates/MAINTAINERS
index 2b27a73c18c5663dfd6296700478c1a29cb42bb2..d5571b0da4ffd547c9b698fdc8003c9ff970f87a 100644 (file)
--- a/board/socrates/MAINTAINERS
+++ b/board/socrates/MAINTAINERS
@@ -1,5 +1,5 @@
 SOCRATES BOARD
-M:     Heiko Schocher <hs@denx.de>
+M:     Heiko Schocher <hs@nabladev.com>
 S:     Maintained
 F:     board/socrates/
 F:     include/configs/socrates.h

diff --git a/doc/git-mailrc b/doc/git-mailrc
index 747ceda3307a99bcb8446abc0dad327eb407a9e6..65626d89eac1463358ff743bbfc09e4d2e9c5017 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -23,7 +23,7 @@ alias bmeng          Bin Meng <bmeng.cn@gmail.com>
 alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
 alias dinh           Dinh Nguyen <dinguyen@kernel.org>
 alias ehristev       Eugen Hristev <eugen.hristev@linaro.org>
-alias hs             Heiko Schocher <hs@denx.de>
+alias hs             Heiko Schocher <hs@nabladev.com>
 alias freenix        Peng Fan <peng.fan@nxp.com>
 alias iwamatsu       Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 alias jaehoon        Jaehoon Chung <jh80.chung@samsung.com>