From: Andrea Parri <parri.and...@gmail.com> 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 <mi...@kernel.org> Signed-off-by: Andrea Parri <parri.and...@gmail.com> Acked-by: Will Deacon <will.dea...@arm.com> Acked-by: Alan Stern <st...@rowland.harvard.edu> Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com> --- 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..ba4dc08fbe95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8086,6 +8086,22 @@ M: Kees Cook <keesc...@chromium.org> S: Maintained F: drivers/misc/lkdtm* +LINUX KERNEL MEMORY CONSISTENCY MODEL +M: Alan Stern <st...@rowland.harvard.edu> +M: Andrea Parri <parri.and...@gmail.com> +M: Will Deacon <will.dea...@arm.com> +M: Peter Zijlstra <pet...@infradead.org> +M: Boqun Feng <boqun.f...@gmail.com> +M: Nicholas Piggin <npig...@gmail.com> +M: David Howells <dhowe...@redhat.com> +M: Jade Alglave <j.algl...@ucl.ac.uk> +M: Luc Maranget <luc.maran...@inria.fr> +M: "Paul E. McKenney" <paul...@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 <chr...@sous-sol.org> L: linux-security-mod...@vger.kernel.org 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 <st...@rowland.harvard.edu> -M: Andrea Parri <parri.and...@gmail.com> -M: Will Deacon <will.dea...@arm.com> -M: Peter Zijlstra <pet...@infradead.org> -M: Boqun Feng <boqun.f...@gmail.com> -M: Nicholas Piggin <npig...@gmail.com> -M: David Howells <dhowe...@redhat.com> -M: Jade Alglave <j.algl...@ucl.ac.uk> -M: Luc Maranget <luc.maran...@inria.fr> -M: "Paul E. McKenney" <paul...@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/ -- 2.5.2
