diff options
| -rw-r--r-- | MAINTAINERS | 16 | ||||
| -rw-r--r-- | tools/memory-model/MAINTAINERS | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9a7f76eadae9..654c6c6154a3 100644 --- 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 index db3bd3fc0435..000000000000 --- 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/ |