diff options
| -rw-r--r-- | .mailmap | 5 | ||||
| -rw-r--r-- | CREDITS | 7 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | kernel/rcu/rcutorture.c | 4 |
4 files changed, 12 insertions, 6 deletions
@@ -62,6 +62,11 @@ Jeff Garzik <[email protected]> Jens Axboe <[email protected]> Jens Osterkamp <[email protected]> John Stultz <[email protected]> Juha Yrjola <at solidboot.com> Juha Yrjola <[email protected]> Juha Yrjola <[email protected]> @@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615 S: Australia N: Josh Triplett -P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB -D: rcutorture maintainer +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 diff --git a/MAINTAINERS b/MAINTAINERS index 86efa7e213c2..95990dd2678c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7424,7 +7424,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]> S: Supported diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 7fa34f86e5ba..948a7693748e 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 <[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, |