[tip:locking/core] MAINTAINERS: Add the Memory Consistency Model subsystem

[tip-bot for Andrea Parri]

Commit-ID:  e7d74c9f900a12ea0bd5cabb3be142441530e24e
Gitweb:     https://git.kernel.org/tip/e7d74c9f900a12ea0bd5cabb3be142441530e24e
Author:     Andrea Parri <parri.andrea@xxxxxxxxx>
AuthorDate: Tue, 20 Feb 2018 15:25:02 -0800
Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Wed, 21 Feb 2018 09:58:12 +0100

MAINTAINERS: Add the Memory Consistency Model subsystem

Move the contents of tools/memory-model/MAINTAINERS into the main
MAINTAINERS file, removing tools/memory-model/MAINTAINERS. This
allows get_maintainer.pl to correctly identify the maintainers of
tools/memory-model/.

Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Andrea Parri <parri.andrea@xxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: akiyks@xxxxxxxxx
Cc: boqun.feng@xxxxxxxxx
Cc: dhowells@xxxxxxxxxx
Cc: j.alglave@xxxxxxxxx
Cc: linux-arch@xxxxxxxxxxxxxxx
Cc: luc.maranget@xxxxxxxx
Cc: nborisov@xxxxxxxx
Cc: npiggin@xxxxxxxxx
Link: http://lkml.kernel.org/r/1519169112-20593-2-git-send-email-paulmck@xxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 MAINTAINERS                    | 16 ++++++++++++++++
 tools/memory-model/MAINTAINERS | 15 ---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9a7f76e..654c6c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8148,6 +8148,22 @@ M:	Kees Cook <keescook@xxxxxxxxxxxx>
 S:	Maintained
 F:	drivers/misc/lkdtm*
 
+LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
+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 db3bd3f..0000000
--- 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/