From 7d9c29bb6c7f41e0a9204377e57935a373677572 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 23 Jun 2020 10:09:19 +0200
Subject: MAINTAINERS: use my kernel.org address

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 <jslaby@suse.cz>
Cc: Joe Perches <joe@perches.com>

Link: https://lore.kernel.org/r/20200623080919.19976-1-jslaby@suse.cz
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 .mailmap | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index c69d9c734fb5..5f35df9398db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -129,6 +129,11 @@ Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
 Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
 Jens Axboe <axboe@suse.de>
 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
+Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
+Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
+Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
+Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
+Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
 Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
 Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-- 
cgit v1.2.3