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 <[email protected]>
Signed-off-by: Wolfgang Wallner <[email protected]>

---

 .mailmap                       | 2 ++
 board/BuR/brppt1/MAINTAINERS   | 2 +-
 board/BuR/brppt2/MAINTAINERS   | 2 +-
 board/BuR/brsmarc1/MAINTAINERS | 2 +-
 board/BuR/brxre1/MAINTAINERS   | 2 +-
 board/BuR/zynq/MAINTAINERS     | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index 145e9ea26e4..04daa274ef3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Anurag Kumar Vulisha <[email protected]> 
<anurag.kumar.vulisha@xilinx.
 Appana Durga Kedareswara rao <[email protected]> 
<[email protected]>
 Ashok Reddy Soma <[email protected]> <[email protected]>
 Atish Patra <[email protected]> <[email protected]>
+Bernhard Messerklinger <[email protected]> 
<[email protected]>
 Bharat Kumar Gogada <[email protected]> 
<[email protected]>
 Bharat Kumar Gogada <[email protected]> <[email protected]>
 Bhargava Sreekantappa Gayathri <[email protected]> 
<[email protected]>
@@ -156,6 +157,7 @@ Wolfgang Denk <[email protected]> <wd@pollux.(none)>
 Wolfgang Denk <[email protected]> <[email protected]>
 Wolfgang Denk <[email protected]> <[email protected]>
 Wolfgang Denk <[email protected]> <wdenk>
+Wolfgang Wallner <[email protected]> 
<[email protected]>
 York Sun <[email protected]>
 York Sun <[email protected]>
 Ɓukasz Majewski <[email protected]>
diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS
index a974a97c157..b24d7eb9ad5 100644
--- a/board/BuR/brppt1/MAINTAINERS
+++ b/board/BuR/brppt1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRPPT1 BOARD
-M:     Wolfgang Wallner <[email protected]>
+M:     Wolfgang Wallner <[email protected]>
 S:     Maintained
 F:     board/BuR/brppt1/
 F:     board/BuR/common/
diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS
index bfeaa571a82..2ab54a909c5 100644
--- a/board/BuR/brppt2/MAINTAINERS
+++ b/board/BuR/brppt2/MAINTAINERS
@@ -1,5 +1,5 @@
 BUR_PPT2 BOARD
-M:     Wolfgang Wallner <[email protected]>
+M:     Wolfgang Wallner <[email protected]>
 S:     Maintained
 F:     board/BuR/brppt2/
 F:     board/BuR/common/
diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS
index 7421f61fc43..f2754582b59 100644
--- a/board/BuR/brsmarc1/MAINTAINERS
+++ b/board/BuR/brsmarc1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRSMARC1 BOARD
-M:     Wolfgang Wallner <[email protected]>
+M:     Wolfgang Wallner <[email protected]>
 S:     Maintained
 F:     board/BuR/brsmarc1/
 F:     board/BuR/common/
diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS
index f826a44b6ac..b424ddca6ca 100644
--- a/board/BuR/brxre1/MAINTAINERS
+++ b/board/BuR/brxre1/MAINTAINERS
@@ -1,5 +1,5 @@
 BRXRE1 BOARD
-M:     Wolfgang Wallner <[email protected]>
+M:     Wolfgang Wallner <[email protected]>
 S:     Maintained
 F:     board/BuR/brxre1/
 F:     board/BuR/common/
diff --git a/board/BuR/zynq/MAINTAINERS b/board/BuR/zynq/MAINTAINERS
index d655cae58d4..e2b04980403 100644
--- a/board/BuR/zynq/MAINTAINERS
+++ b/board/BuR/zynq/MAINTAINERS
@@ -1,5 +1,5 @@
 ZYNQ BOARD
-M:     Wolfgang Wallner <[email protected]>
+M:     Wolfgang Wallner <[email protected]>
 S:     Maintained
 F:     board/BuR/zynq/
 F:     board/BuR/common/
-- 
2.52.0

base-commit: c6ee44b5573a90b0a3a36cf858954e04439ae632
branch: us/abb_mail

Reply via email to