The patch titled
Subject: Update Shuah Khan's email addresses in MAINTAINERS and .mailmap
has been added to the -mm tree. Its filename is
update-email-addresses-in-maintainers-and-mailmap.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/update-email-addresses-in-maintainers-and-mailmap.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/update-email-addresses-in-maintainers-and-mailmap.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
Subject: Update Shuah Khan's email addresses in MAINTAINERS and .mailmap
Link: http://lkml.kernel.org/r/1465943427-11528-1-git-send-email-shuahkh@xxxxxxxxxxxxxxx
Signed-off-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
.mailmap | 1 +
MAINTAINERS | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff -puN .mailmap~update-email-addresses-in-maintainers-and-mailmap .mailmap
--- a/.mailmap~update-email-addresses-in-maintainers-and-mailmap
+++ a/.mailmap
@@ -122,6 +122,7 @@ Santosh Shilimkar <santosh.shilimkar@ora
Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
S.Ã?aÄ?lar Onur <caglar@xxxxxxxxxxxxx>
Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx> <shiraz.hashim@xxxxxx>
+Shuah Khan <shuah@xxxxxxxxxx> <shuahkhan@xxxxxxxxx> <shuah.khan@xxxxxx> <shuahkh@xxxxxxxxxxxxxxx> <shuah.kh@xxxxxxxxxxx>
Simon Kelley <simon@xxxxxxxxxxxxxxxxx>
Stéphane Witzmann <stephane.witzmann@xxxxxxxxxxxxxxxxxxxxxxxxx>
Stephen Hemminger <shemminger@xxxxxxxx>
diff -puN MAINTAINERS~update-email-addresses-in-maintainers-and-mailmap MAINTAINERS
--- a/MAINTAINERS~update-email-addresses-in-maintainers-and-mailmap
+++ a/MAINTAINERS
@@ -6487,6 +6487,7 @@ F: include/uapi/linux/sunrpc/
KERNEL SELFTEST FRAMEWORK
M: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
+M: Shuah Khan <shuah@xxxxxxxxxx>
L: linux-kselftest@xxxxxxxxxxxxxxx
T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
S: Maintained
@@ -11886,7 +11887,8 @@ F: drivers/usb/common/usb-otg-fsm.c
USB OVER IP DRIVER
M: Valentina Manea <valentina.manea.m@xxxxxxxxx>
-M: Shuah Khan <shuah.kh@xxxxxxxxxxx>
+M: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
+M: Shuah Khan <shuah@xxxxxxxxxx>
L: linux-usb@xxxxxxxxxxxxxxx
S: Maintained
F: Documentation/usb/usbip_protocol.txt
_
Patches currently in -mm which might be from shuahkh@xxxxxxxxxxxxxxx are
update-email-addresses-in-maintainers-and-mailmap.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html