From 7ca8e63c8ed352e7ed10e9cc4d229823dded6fa2 Mon Sep 17 00:00:00 2001 From: Alexander Lobakin Date: Fri, 19 Jun 2020 09:51:14 +0000 Subject: mailmap: add entries for Alexander Lobakin My D-Link and Yandex addresses don't exist anymore, map them to my private box. Signed-off-by: Alexander Lobakin Link: https://lore.kernel.org/r/5YUtoWlS7NX1N6TxI4ddZ9V-Yx8Bn8wzrEVJqfkTuwEzZjAsJg157goV81xPAU76k84Nis2uBwdHWk4JmYHbvGmd_JcBTk-rZDVpFNPNolU=@pm.me Signed-off-by: Jonathan Corbet --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index c69d9c734fb5..86eb59ad4c54 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,8 @@ Aleksey Gorelov Aleksandar Markovic Alex Shi Alex Shi +Alexander Lobakin +Alexander Lobakin Alexandre Belloni Alexei Starovoitov Alexei Starovoitov -- cgit v1.2.3-59-g8ed1b From 7d9c29bb6c7f41e0a9204377e57935a373677572 Mon Sep 17 00:00:00 2001 From: Jiri Slaby 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 Cc: Joe Perches Link: https://lore.kernel.org/r/20200623080919.19976-1-jslaby@suse.cz Signed-off-by: Jonathan Corbet --- .mailmap | 5 +++++ MAINTAINERS | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index c69d9c734fb5..5f35df9398db 100644 --- a/.mailmap +++ b/.mailmap @@ -129,6 +129,11 @@ Jeff Layton Jeff Layton Jens Axboe Jens Osterkamp +Jiri Slaby +Jiri Slaby +Jiri Slaby +Jiri Slaby +Jiri Slaby Johan Hovold Johan Hovold John Paul Adrian Glaubitz diff --git a/MAINTAINERS b/MAINTAINERS index 68f21d46614c..b926f64f53ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2881,7 +2881,7 @@ S: Supported F: drivers/net/wireless/ath/* ATHEROS ATH5K WIRELESS DRIVER -M: Jiri Slaby +M: Jiri Slaby M: Nick Kossifidis M: Luis Chamberlain L: linux-wireless@vger.kernel.org @@ -11560,7 +11560,7 @@ F: drivers/media/pci/meye/ F: include/uapi/linux/meye.h MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD -M: Jiri Slaby +M: Jiri Slaby S: Maintained F: Documentation/driver-api/serial/moxa-smartio.rst F: drivers/tty/mxser.* @@ -15348,7 +15348,7 @@ F: scripts/selinux/ F: security/selinux/ SENSABLE PHANTOM -M: Jiri Slaby +M: Jiri Slaby S: Maintained F: drivers/misc/phantom.c F: include/uapi/linux/phantom.h @@ -17365,7 +17365,7 @@ K: ^Subject:.*(?i)trivial TTY LAYER M: Greg Kroah-Hartman -M: Jiri Slaby +M: Jiri Slaby S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git F: Documentation/driver-api/serial/ -- cgit v1.2.3-59-g8ed1b From 453a969bfb11a57768d8bd4875f0ae0ca1e54a17 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Wed, 1 Jul 2020 14:58:11 +0300 Subject: mailmap: add entry for obsolete email address Map old corporate email address @yandex-team.ru to stable private address. Signed-off-by: Konstantin Khlebnikov Link: https://lore.kernel.org/r/159360469186.24918.10108157093572183535.stgit@zurg Signed-off-by: Jonathan Corbet --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 4670b50da0a2..43ba073cae36 100644 --- a/.mailmap +++ b/.mailmap @@ -153,6 +153,7 @@ Kamil Konieczny Kay Sievers Kenneth W Chen Konstantin Khlebnikov +Konstantin Khlebnikov Koushik Krzysztof Kozlowski Krzysztof Kozlowski -- cgit v1.2.3-59-g8ed1b From da2f0060d857da25a9e3ab5cb56a4b145f85c98a Mon Sep 17 00:00:00 2001 From: Alexander Lobakin Date: Thu, 30 Jul 2020 16:59:45 +0000 Subject: mailmap: add entry for My Marvell account has been suspended, map the address to my private mail. Signed-off-by: Alexander Lobakin Link: https://lore.kernel.org/r/9xzFiqHAFGYuKfUycRaCQSIgsqmeL9E9SA3lSoqOMUPhFVaAgSgvukCUWO7iRbjtiUrFjK46fhu7dJ5TaCv1EjaNFm5yF_H3y5S1s_QALCA=@pm.me Signed-off-by: Jonathan Corbet --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 43ba073cae36..9b0b9ec3e53e 100644 --- a/.mailmap +++ b/.mailmap @@ -19,6 +19,7 @@ Aleksandar Markovic Alex Shi Alexander Lobakin +Alexander Lobakin Alexander Lobakin Alexandre Belloni Alexei Starovoitov -- cgit v1.2.3-59-g8ed1b