[PATCH 2/2] MAINTAINERS: add the Memory Consistency Model subsystem

[Andrea Parri]

Integrate (and then remove) tools/memory-model/MAINTAINERS into the
main MAINTAINERS file. This way get_maintainer.pl can give a "right
answer" for tools/memory-model/.

Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Andrea Parri <parri.andrea@xxxxxxxxx>
---
 MAINTAINERS                    | 16 ++++++++++++++++
 tools/memory-model/MAINTAINERS | 15 ---------------
 2 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 tools/memory-model/MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 217a8759e897e..08454be9237d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8091,6 +8091,22 @@ M:	Kees Cook <keescook@xxxxxxxxxxxx>
 S:	Maintained
 F:	drivers/misc/lkdtm*
 
+LINUX KERNEL MEMORY CONSISTENCY MODEL
+M:	Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
+M:	Andrea Parri <parri.andrea@xxxxxxxxx>
+M:	Will Deacon <will.deacon@xxxxxxx>
+M:	Peter Zijlstra <peterz@xxxxxxxxxxxxx>
+M:	Boqun Feng <boqun.feng@xxxxxxxxx>
+M:	Nicholas Piggin <npiggin@xxxxxxxxx>
+M:	David Howells <dhowells@xxxxxxxxxx>
+M:	Jade Alglave <j.alglave@xxxxxxxxx>
+M:	Luc Maranget <luc.maranget@xxxxxxxx>
+M:	"Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
+L:	linux-kernel@xxxxxxxxxxxxxxx
+S:	Supported
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:	tools/memory-model/
+
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:	Chris Wright <chrisw@xxxxxxxxxxxx>
 L:	linux-security-module@xxxxxxxxxxxxxxx
diff --git a/tools/memory-model/MAINTAINERS b/tools/memory-model/MAINTAINERS
deleted file mode 100644
index db3bd3fc0435b..0000000000000
--- a/tools/memory-model/MAINTAINERS
+++ /dev/null
@@ -1,15 +0,0 @@
-LINUX KERNEL MEMORY CONSISTENCY MODEL
-M:	Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
-M:	Andrea Parri <parri.andrea@xxxxxxxxx>
-M:	Will Deacon <will.deacon@xxxxxxx>
-M:	Peter Zijlstra <peterz@xxxxxxxxxxxxx>
-M:	Boqun Feng <boqun.feng@xxxxxxxxx>
-M:	Nicholas Piggin <npiggin@xxxxxxxxx>
-M:	David Howells <dhowells@xxxxxxxxxx>
-M:	Jade Alglave <j.alglave@xxxxxxxxx>
-M:	Luc Maranget <luc.maranget@xxxxxxxx>
-M:	"Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
-L:	linux-kernel@xxxxxxxxxxxxxxx
-S:	Supported
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
-F:	tools/memory-model/
-- 
2.7.4