torture: Place all torture-test modules in one MAINTAINERS group

There is some confusion about where patches to kernel/torture.c
and kernel/locking/locktorture.c should be sent.  This commit
therefore updates MAINTAINERS appropriately.

Reported-by: Peter Zijlstra <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
Acked-by: Peter Zijlstra (Intel) <[email protected]>

1 files changed, 13 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index aa71ab52fd76..bdeb64f8bf54 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8194,6 +8194,7 @@ F:	arch/*/include/asm/rwsem.h
 F:	include/linux/seqlock.h
 F:	lib/locking*.[ch]
 F:	kernel/locking/
+X:	kernel/locking/locktorture.c
 
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
 M:	"Richard Russon (FlatCap)" <[email protected]>
@@ -11451,15 +11452,6 @@ L:	[email protected]
 S:	Orphan
 F:	drivers/net/wireless/ray*
 
-RCUTORTURE MODULE
-M:	Josh Triplett <[email protected]>
-M:	"Paul E. McKenney" <[email protected]>
-L:	[email protected]
-S:	Supported
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
-F:	Documentation/RCU/torture.txt
-F:	kernel/rcu/rcutorture.c
-
 RCUTORTURE TEST FRAMEWORK
 M:	"Paul E. McKenney" <[email protected]>
 M:	Josh Triplett <[email protected]>
@@ -13748,6 +13740,18 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/platform/x86/topstar-laptop.c
 
+TORTURE-TEST MODULES
+M:	Davidlohr Bueso <[email protected]>
+M:	"Paul E. McKenney" <[email protected]>
+M:	Josh Triplett <[email protected]>
+L:	[email protected]
+S:	Supported
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:	Documentation/RCU/torture.txt
+F:	kernel/torture.c
+F:	kernel/rcu/rcutorture.c
+F:	kernel/locking/locktorture.c
+
 TOSHIBA ACPI EXTRAS DRIVER
 M:	Azael Avalos <[email protected]>
 L:	[email protected]