The patch titled
Subject: Josh has moved
has been added to the -mm tree. Its filename is
update-my-email-addresses-and-related-info.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/update-my-email-addresses-and-related-info.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/update-my-email-addresses-and-related-info.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: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Subject: Josh has moved
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>
Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
.mailmap | 5 +++++
CREDITS | 7 ++++---
MAINTAINERS | 2 +-
kernel/rcu/rcutorture.c | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff -puN .mailmap~update-my-email-addresses-and-related-info .mailmap
--- a/.mailmap~update-my-email-addresses-and-related-info
+++ a/.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 -puN CREDITS~update-my-email-addresses-and-related-info CREDITS
--- a/CREDITS~update-my-email-addresses-and-related-info
+++ a/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 -puN MAINTAINERS~update-my-email-addresses-and-related-info MAINTAINERS
--- a/MAINTAINERS~update-my-email-addresses-and-related-info
+++ a/MAINTAINERS
@@ -7423,7 +7423,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 -puN kernel/rcu/rcutorture.c~update-my-email-addresses-and-related-info kernel/rcu/rcutorture.c
--- a/kernel/rcu/rcutorture.c~update-my-email-addresses-and-related-info
+++ a/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,
_
Patches currently in -mm which might be from josh@xxxxxxxxxxxxxxxx are
update-my-email-addresses-and-related-info.patch
checkpatch-add-an-index-variable-for-fixed-lines.patch
checkpatch-add-ability-to-insert-and-delete-lines-to-patch-file.patch
initramfs-support-initramfs-that-is-bigger-than-2gib.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
