[PATCH] Update my email addresses and related info

[Josh Triplett]

My IBM email addresses haven't worked for years; also map some
old-but-functional forwarding addresses to my canonical address.

Update my GPG key fingerprint; I moved to 4096R a long time ago.

Update description.

Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
---
 .mailmap                | 5 +++++
 CREDITS                 | 7 ++++---
 MAINTAINERS             | 2 +-
 kernel/rcu/rcutorture.c | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index df1baba..1ad6873 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@xxxxxxxxxxxxxx>
 Jens Axboe <axboe@xxxxxxx>
 Jens Osterkamp <Jens.Osterkamp@xxxxxxxxxx>
 John Stultz <johnstul@xxxxxxxxxx>
+<josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxxxxxxx>
+<josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxx>
+<josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxxxxxxxxxx>
+<josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxx>
+<josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxxxx>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola@xxxxxxxxx>
 Juha Yrjola <juha.yrjola@xxxxxxxxxxxxx>
diff --git a/CREDITS b/CREDITS
index 28ee151..a80b667 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615
 S: Australia
 
 N: Josh Triplett
-E: josh@xxxxxxxxxxxxxxx
-P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB
-D: rcutorture maintainer
+E: josh@xxxxxxxxxxxxxxxx
+P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C  1E67 0ED9 A3DF 8AFF 873D
+D: RCU and rcutorture
 D: lock annotations, finding and fixing lock bugs
+D: kernel tinification
 
 N: Winfried Trümper
 E: winni@xxxxxxxxxx
diff --git a/MAINTAINERS b/MAINTAINERS
index 702ca10..b2a42e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7387,7 +7387,7 @@ S:	Orphan
 F:	drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
-M:	Josh Triplett <josh@xxxxxxxxxxxxxxx>
+M:	Josh Triplett <josh@xxxxxxxxxxxxxxxx>
 M:	"Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Supported
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 7fa34f8..948a769 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -18,7 +18,7 @@
  * Copyright (C) IBM Corporation, 2005, 2006
  *
  * Authors: Paul E. McKenney <paulmck@xxxxxxxxxx>
- *	  Josh Triplett <josh@xxxxxxxxxxxxxxx>
+ *	  Josh Triplett <josh@xxxxxxxxxxxxxxxx>
  *
  * See also:  Documentation/RCU/torture.txt
  */
@@ -51,7 +51,7 @@
 #include <linux/torture.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Paul E. McKenney <paulmck@xxxxxxxxxx> and Josh Triplett <josh@xxxxxxxxxxxxxxx>");
+MODULE_AUTHOR("Paul E. McKenney <paulmck@xxxxxxxxxx> and Josh Triplett <josh@xxxxxxxxxxxxxxxx>");
 
 
 torture_param(int, fqs_duration, 0,
-- 
2.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/