Update email addresses in MAINTAINERS and .mailmap

Updating email addresses in MAINTAINERS and .mailmap files.

Cc: [email protected]
Signed-off-by: Shuah Khan <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/.mailmap b/.mailmap
index 4a293bea648d66306694f3c8ecf62645d5e2c852..779a9caadc7f3dcc7296d7ada0b048a6e91b23c4 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -123,6 +123,7 @@ Santosh Shilimkar <[email protected]>
 Sascha Hauer <[email protected]>
 S.Çağlar Onur <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>
+Shuah Khan <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 29e22bf887a9a103606d16774f373795ce26512e..7c326f15500151a79a0b81de2315cde82f32f02c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6497,6 +6497,7 @@ F:        include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:     Shuah Khan <[email protected]>
+M:     Shuah Khan <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 S:     Maintained
@@ -11902,7 +11903,8 @@ F:      drivers/usb/common/usb-otg-fsm.c
 
 USB OVER IP DRIVER
 M:     Valentina Manea <[email protected]>
-M:     Shuah Khan <[email protected]>
+M:     Shuah Khan <[email protected]>
+M:     Shuah Khan <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/usb/usbip_protocol.txt