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 <h...@nabladev.com> --- Azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=185&view=results .mailmap | 5 +++++ MAINTAINERS | 6 +++--- board/aristainetos/MAINTAINERS | 2 +- board/bosch/shc/MAINTAINERS | 2 +- board/keymile/km83xx/MAINTAINERS | 2 +- board/siemens/capricorn/MAINTAINERS | 2 +- board/siemens/corvus/MAINTAINERS | 2 +- board/siemens/smartweb/MAINTAINERS | 2 +- board/siemens/taurus/MAINTAINERS | 2 +- board/socrates/MAINTAINERS | 2 +- doc/git-mailrc | 2 +- 11 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.mailmap b/.mailmap index 67a42217cf8..f15697ca2df 100644 --- a/.mailmap +++ b/.mailmap @@ -48,6 +48,11 @@ Greg Malysa <malysag...@gmail.com> <greg.mal...@timesys.com> Harini Katakam <harini.kata...@amd.com> <harini.kata...@xilinx.com> Harsha <harsha.har...@amd.com> <harsha.har...@xilinx.com> Heiko Stuebner <heiko.stueb...@cherry.de> <heiko.stueb...@theobroma-systems.com> +Heiko Schocher <h...@nabladev.com> <h...@denx.de> +Heiko Schocher <h...@nabladev.com> <h...@pollux.denx.de> +Heiko Schocher <h...@nabladev.com> <heiko.schoc...@invitel.hu> +Heiko Schocher <h...@nabladev.com> <[h...@denx.de]> +Heiko Schocher <h...@nabladev.com> <hs@pollux.(none)> Heinrich Schuchardt <xypron.g...@gmx.de> <heinrich.schucha...@canonical.com> Heinrich Schuchardt <xypron.g...@gmx.de> xypron.g...@gmx.de <xypron.g...@gmx.de> Ibai Erkiaga <ibai.erkiaga-elo...@amd.com> <ibai.erkiaga-elo...@xilinx.com> diff --git a/MAINTAINERS b/MAINTAINERS index d6c4587bf86..05291ed1ad0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1244,7 +1244,7 @@ F: drivers/misc/gsc.c F: include/gsc.h I2C -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 <h...@denx.de> +M: Heiko Schocher <h...@nabladev.com> S: Maintained F: drivers/pci/pci_mpc85xx.c @@ -1795,7 +1795,7 @@ F: lib/optee UBI M: Kyungmin Park <kmp...@infradead.org> -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 c81bef9cb7c..77d7b1614c8 100644 --- a/board/aristainetos/MAINTAINERS +++ b/board/aristainetos/MAINTAINERS @@ -1,5 +1,5 @@ ARISTAINETOS BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 58104cc1318..a30c672e1d6 100644 --- a/board/bosch/shc/MAINTAINERS +++ b/board/bosch/shc/MAINTAINERS @@ -1,5 +1,5 @@ SHC BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 8822e5d9155..af0d6afb2b4 100644 --- a/board/keymile/km83xx/MAINTAINERS +++ b/board/keymile/km83xx/MAINTAINERS @@ -1,6 +1,6 @@ KM83XX BOARD M: Holger Brunck <holger.bru...@hitachienergy.com> -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 9c8c7a6ecdc..6c253983cf0 100644 --- a/board/siemens/capricorn/MAINTAINERS +++ b/board/siemens/capricorn/MAINTAINERS @@ -1,6 +1,6 @@ CAPRICORN BOARD M: Alexander Sverdlin <alexander.sverd...@siemens.com> -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@nabladev.com> M: Walter Schweizer <walter.schwei...@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 59176aae575..4471cf3ce3c 100644 --- a/board/siemens/corvus/MAINTAINERS +++ b/board/siemens/corvus/MAINTAINERS @@ -1,5 +1,5 @@ CORVUS BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 51298ffb5d6..09d7667241c 100644 --- a/board/siemens/smartweb/MAINTAINERS +++ b/board/siemens/smartweb/MAINTAINERS @@ -1,5 +1,5 @@ SMARTWEB_HW BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@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 74e3518e0d9..c17bd51a0de 100644 --- a/board/siemens/taurus/MAINTAINERS +++ b/board/siemens/taurus/MAINTAINERS @@ -1,5 +1,5 @@ TAURUS BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@nabladev.com> S: Maintained F: board/siemens/taurus/ F: include/configs/taurus.h diff --git a/board/socrates/MAINTAINERS b/board/socrates/MAINTAINERS index 2b27a73c18c..d5571b0da4f 100644 --- a/board/socrates/MAINTAINERS +++ b/board/socrates/MAINTAINERS @@ -1,5 +1,5 @@ SOCRATES BOARD -M: Heiko Schocher <h...@denx.de> +M: Heiko Schocher <h...@nabladev.com> S: Maintained F: board/socrates/ F: include/configs/socrates.h diff --git a/doc/git-mailrc b/doc/git-mailrc index 747ceda3307..65626d89eac 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -23,7 +23,7 @@ alias bmeng Bin Meng <bmeng...@gmail.com> alias danielschwierzeck Daniel Schwierzeck <daniel.schwierz...@gmail.com> alias dinh Dinh Nguyen <dingu...@kernel.org> alias ehristev Eugen Hristev <eugen.hris...@linaro.org> -alias hs Heiko Schocher <h...@denx.de> +alias hs Heiko Schocher <h...@nabladev.com> alias freenix Peng Fan <peng....@nxp.com> alias iwamatsu Nobuhiro Iwamatsu <iwama...@nigauri.org> alias jaehoon Jaehoon Chung <jh80.ch...@samsung.com> -- 2.20.1 base-commit: 123cd77122a13288e1552b5d9b7c22a6f19e2e02
