From: Andrea Parri <parri.andrea@xxxxxxxxx> 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> Acked-by: Will Deacon <will.deacon@xxxxxxx> Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> --- 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 <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 db3bd3fc0435..000000000000 --- 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.5.2
