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@kernel.org>
Signed-off-by: Andrea Parri <parri.andrea@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: nborisov@suse.com
Cc: npiggin@gmail.com
Link: http://lkml.kernel.org/r/1519169112-20593-2-git-send-email-paulmck@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 9a7f76e..654c6c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8148,6 +8148,22 @@ M:       Kees Cook <keescook@chromium.org>
 S:     Maintained
 F:     drivers/misc/lkdtm*
 
+LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
+M:     Alan Stern <stern@rowland.harvard.edu>
+M:     Andrea Parri <parri.andrea@gmail.com>
+M:     Will Deacon <will.deacon@arm.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+M:     Boqun Feng <boqun.feng@gmail.com>
+M:     Nicholas Piggin <npiggin@gmail.com>
+M:     David Howells <dhowells@redhat.com>
+M:     Jade Alglave <j.alglave@ucl.ac.uk>
+M:     Luc Maranget <luc.maranget@inria.fr>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+L:     linux-kernel@vger.kernel.org
+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@sous-sol.org>
 L:     linux-security-module@vger.kernel.org

diff --git a/tools/memory-model/MAINTAINERS b/tools/memory-model/MAINTAINERS
deleted file mode 100644 (file)
index db3bd3f..0000000
--- a/tools/memory-model/MAINTAINERS
+++ /dev/null
@@ -1,15 +0,0 @@
-LINUX KERNEL MEMORY CONSISTENCY MODEL
-M:     Alan Stern <stern@rowland.harvard.edu>
-M:     Andrea Parri <parri.andrea@gmail.com>
-M:     Will Deacon <will.deacon@arm.com>
-M:     Peter Zijlstra <peterz@infradead.org>
-M:     Boqun Feng <boqun.feng@gmail.com>
-M:     Nicholas Piggin <npiggin@gmail.com>
-M:     David Howells <dhowells@redhat.com>
-M:     Jade Alglave <j.alglave@ucl.ac.uk>
-M:     Luc Maranget <luc.maranget@inria.fr>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-L:     linux-kernel@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
-F:     tools/memory-model/