From: Andrea Parri <[email protected]>

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 <[email protected]>
Signed-off-by: Andrea Parri <[email protected]>
Acked-by: Will Deacon <[email protected]>
Acked-by: Alan Stern <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
---
 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 e3581413420c..50bcedbdca86 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8086,6 +8086,22 @@ M:       Kees Cook <[email protected]>
 S:     Maintained
 F:     drivers/misc/lkdtm*
 
+LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
+M:     Alan Stern <[email protected]>
+M:     Andrea Parri <[email protected]>
+M:     Will Deacon <[email protected]>
+M:     Peter Zijlstra <[email protected]>
+M:     Boqun Feng <[email protected]>
+M:     Nicholas Piggin <[email protected]>
+M:     David Howells <[email protected]>
+M:     Jade Alglave <[email protected]>
+M:     Luc Maranget <[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:     tools/memory-model/
+
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:     Chris Wright <[email protected]>
 L:     [email protected]
diff --git a/tools/memory-model/MAINTAINERS b/tools/memory-model/MAINTAINERS
deleted file mode 100644
index db3bd3fc0435..000000000000
--- a/tools/memory-model/MAINTAINERS
+++ /dev/null
@@ -1,15 +0,0 @@
-LINUX KERNEL MEMORY CONSISTENCY MODEL
-M:     Alan Stern <[email protected]>
-M:     Andrea Parri <[email protected]>
-M:     Will Deacon <[email protected]>
-M:     Peter Zijlstra <[email protected]>
-M:     Boqun Feng <[email protected]>
-M:     Nicholas Piggin <[email protected]>
-M:     David Howells <[email protected]>
-M:     Jade Alglave <[email protected]>
-M:     Luc Maranget <[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:     tools/memory-model/
-- 
2.5.2

Reply via email to