Skip to contentSkip to conversation

Update my email addresses and related info

PATCH New Josh Triplett 1 participant 1 message Jul 30, 2014

Subsystems (2)
lore
Share & tools
lore

Josh Triplett

author maintainer
#0 lore raw

PATCH 1/1 Update my email addresses and related info

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.

---
 .mailmap                | 5 +++++
 CREDITS                 | 7 ++++---
 MAINTAINERS             | 2 +-
 kernel/rcu/rcutorture.c | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)
.mailmap +5 -0
index df1baba..1ad6873 100644
@@ -62,6 +62,11 @@ Jeff Garzik <[email protected]>
 Jens Axboe <[email protected]>
 Jens Osterkamp <[email protected]>
 John Stultz <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <[email protected]>
 Juha Yrjola <[email protected]>
CREDITS +4 -3
index 28ee151..a80b667 100644
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615
 S: Australia
 
 N: Josh Triplett
-E: [email protected]
-P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB
-D: rcutorture maintainer
+E: [email protected]
+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: [email protected]
MAINTAINERS +1 -1
index 702ca10..b2a42e6 100644
@@ -7387,7 +7387,7 @@ S:	Orphan
 F:	drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
-M:	Josh Triplett <[email protected]>
+M:	Josh Triplett <[email protected]>
 M:	"Paul E. McKenney" <[email protected]>
 L:	[email protected]
 S:	Supported
kernel/rcu/rcutorture.c +2 -2
index 7fa34f8..948a769 100644
@@ -18,7 +18,7 @@
  * Copyright (C) IBM Corporation, 2005, 2006
  *
  * Authors: Paul E. McKenney <[email protected]>
- *	  Josh Triplett <[email protected]>
+ *	  Josh Triplett <[email protected]>
  *
  * See also:  Documentation/RCU/torture.txt
  */
@@ -51,7 +51,7 @@
 #include <linux/torture.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Paul E. McKenney <[email protected]> and Josh Triplett <[email protected]>");
+MODULE_AUTHOR("Paul E. McKenney <[email protected]> and Josh Triplett <[email protected]>");
 
 
 torture_param(int, fqs_duration, 0,
Signature · 1 line
2.0.1