Change email addresses for B&R Industrial Automation

B&R Industrial Automation has been acquired by ABB in 2017, and this
will be reflected in our email addresses beginning from December 2025.

The email addresses change as follows:
 @br-automation.com -> @<country-code>.abb.com

The existing email addresses will be valid until December 2026.

Add entries for Bernhard Messerklinger and myself to .mailmap, and
update the MAINTAINERS files.

Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Signed-off-by: Wolfgang Wallner <wolfgang.wallner@at.abb.com>

diff --git a/.mailmap b/.mailmap
index 145e9ea26e4faed672f4e6a118469becc805d260..04daa274ef31cf56e9ea8dc03c0777b805743539 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Anurag Kumar Vulisha <AnuragKumar.Vulisha@amd.com> <anurag.kumar.vulisha@xilinx.
 Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com> <appana.durga.rao@xilinx.com>
 Ashok Reddy Soma <ashok.reddy.soma@amd.com> <ashok.reddy.soma@xilinx.com>
 Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
+Bernhard Messerklinger <bernhard.messerklinger@at.abb.com> <bernhard.messerklinger@br-automation.com>
 Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharat.kumar.gogada@xilinx.com>
 Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharatku@xilinx.com>
 Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@amd.com> <bhargava.sreekantappa-gayathri@xilinx.com>
@@ -156,6 +157,7 @@ Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
 Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
 Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
 Wolfgang Denk <wd@denx.de> <wdenk>
+Wolfgang Wallner <wolfgang.wallner@at.abb.com> <wolfgang.wallner@br-automation.com>
 York Sun <york.sun@nxp.com>
 York Sun <yorksun@freescale.com>
 Łukasz Majewski <l.majewski@samsung.com>

diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS
index a974a97c157287fe066c1de4fd62873d7b199ef3..b24d7eb9ad5bed6911594b15a7f9329bcfd0d1c5 100644 (file)
--- a/board/BuR/brppt1/MAINTAINERS
+++ b/board/BuR/brppt1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRPPT1 BOARD
-M:     Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:     Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:     Maintained
 F:     board/BuR/brppt1/
 F:     board/BuR/common/

diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS
index bfeaa571a82c7cf0af114b497b6ab9c0409d6375..2ab54a909c56c195729514ef47cb30e26498b40f 100644 (file)
--- a/board/BuR/brppt2/MAINTAINERS
+++ b/board/BuR/brppt2/MAINTAINERS
@@ -1,5 +1,5 @@
 BUR_PPT2 BOARD
-M:     Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:     Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:     Maintained
 F:     board/BuR/brppt2/
 F:     board/BuR/common/

diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS
index 7421f61fc43f2337f2784cec0e38b0881e869665..f2754582b59d5ee3a29dc5bae8163851656fae5e 100644 (file)
--- a/board/BuR/brsmarc1/MAINTAINERS
+++ b/board/BuR/brsmarc1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRSMARC1 BOARD
-M:     Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:     Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:     Maintained
 F:     board/BuR/brsmarc1/
 F:     board/BuR/common/

diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS
index f826a44b6ac2f7eb6b046abb4e461f471ea9610b..b424ddca6ca6a4881cac8410fc2217cbc5457cc4 100644 (file)
--- a/board/BuR/brxre1/MAINTAINERS
+++ b/board/BuR/brxre1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRXRE1 BOARD
-M:     Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:     Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:     Maintained
 F:     board/BuR/brxre1/
 F:     board/BuR/common/

diff --git a/board/BuR/zynq/MAINTAINERS b/board/BuR/zynq/MAINTAINERS
index d655cae58d462ac0b39039f9b89be9cae23a8ca7..e2b04980403748accd5a316c46d712165b2b9e14 100644 (file)
--- a/board/BuR/zynq/MAINTAINERS
+++ b/board/BuR/zynq/MAINTAINERS
@@ -1,5 +1,5 @@
 ZYNQ BOARD
-M:     Wolfgang Wallner <wolfgang.wallner@br-automation.com>
+M:     Wolfgang Wallner <wolfgang.wallner@at.abb.com>
 S:     Maintained
 F:     board/BuR/zynq/
 F:     board/BuR/common/