There were enough problems with suse.{com,cz} MTAs recently. I am bored
by restoring lost e-mails from public archives. Let's switch (all) my
MAINTAINERS addresses to @kernel.org and forward the e-mails there as I
wish.

And add the whole history to .mailmap.

Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Cc: Joe Perches <j...@perches.com>

---

[v2] add .mailmap entries

 .mailmap    | 5 +++++
 MAINTAINERS | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 86eb59ad4c54..4670b50da0a2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,6 +131,11 @@ Jeff Layton <jlay...@kernel.org> <jlay...@poochiereds.net>
 Jeff Layton <jlay...@kernel.org> <jlay...@primarydata.com>
 Jens Axboe <ax...@suse.de>
 Jens Osterkamp <jens.osterk...@de.ibm.com>
+Jiri Slaby <jirisl...@kernel.org> <jirisl...@gmail.com>
+Jiri Slaby <jirisl...@kernel.org> <jsl...@novell.com>
+Jiri Slaby <jirisl...@kernel.org> <jsl...@suse.com>
+Jiri Slaby <jirisl...@kernel.org> <jsl...@suse.cz>
+Jiri Slaby <jirisl...@kernel.org> <xsl...@fi.muni.cz>
 Johan Hovold <jo...@kernel.org> <jhov...@gmail.com>
 Johan Hovold <jo...@kernel.org> <jo...@hovoldconsulting.com>
 John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
diff --git a/MAINTAINERS b/MAINTAINERS
index d282ee3492e0..abc7b8fab240 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2881,7 +2881,7 @@ S:        Supported
 F:     drivers/net/wireless/ath/*
 
 ATHEROS ATH5K WIRELESS DRIVER
-M:     Jiri Slaby <jirisl...@gmail.com>
+M:     Jiri Slaby <jirisl...@kernel.org>
 M:     Nick Kossifidis <mickfl...@gmail.com>
 M:     Luis Chamberlain <mcg...@kernel.org>
 L:     linux-wirel...@vger.kernel.org
@@ -11554,7 +11554,7 @@ F:      drivers/media/pci/meye/
 F:     include/uapi/linux/meye.h
 
 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
-M:     Jiri Slaby <jirisl...@gmail.com>
+M:     Jiri Slaby <jirisl...@kernel.org>
 S:     Maintained
 F:     Documentation/driver-api/serial/moxa-smartio.rst
 F:     drivers/tty/mxser.*
@@ -15364,7 +15364,7 @@ F:      scripts/selinux/
 F:     security/selinux/
 
 SENSABLE PHANTOM
-M:     Jiri Slaby <jirisl...@gmail.com>
+M:     Jiri Slaby <jirisl...@kernel.org>
 S:     Maintained
 F:     drivers/misc/phantom.c
 F:     include/uapi/linux/phantom.h
@@ -17381,7 +17381,7 @@ K:      ^Subject:.*(?i)trivial
 
 TTY LAYER
 M:     Greg Kroah-Hartman <gre...@linuxfoundation.org>
-M:     Jiri Slaby <jsl...@suse.com>
+M:     Jiri Slaby <jirisl...@kernel.org>
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 F:     Documentation/driver-api/serial/
-- 
2.27.0

Reply via email to