On Fri, Feb 02, 2018 at 03:17:53PM -0800, Paul E. McKenney wrote:
> On Fri, Feb 02, 2018 at 09:54:27AM +0100, Andrea Parri wrote:
> > On Thu, Feb 01, 2018 at 03:09:41PM -0800, Paul E. McKenney wrote:
> > > On Thu, Feb 01, 2018 at 10:26:50AM -0500, Alan Stern wrote:
> > > > On Thu, 1 Feb 2018, Andrea Parri wrote:
> > > >
> > > > > Ingo pointed out that:
> > > > >
> > > > > "The "memory model" name is overly generic, ambiguous and somewhat
> > > > > misleading, as we usually mean the virtual memory layout/model
> > > > > when we say "memory model". GCC too uses it in that sense [...]"
> > > > >
> > > > > Make it clearer that, in the context of tools/memory-model/, the term
> > > > > "memory-model" is used as shorthand for "memory consistency model" by
> > > > > calling out this convention in tools/memory-model/README.
> > > > >
> > > > > Stick to the full name in sources' headers and for the subsystem name.
> > > > >
> > > > > Suggested-by: Ingo Molnar <mi...@kernel.org>
> > > > > Signed-off-by: Andrea Parri <parri.and...@gmail.com>
> > > >
> > > > For both patches:
> > > >
> > > > Acked-by: Alan Stern <st...@rowland.harvard.edu>
> > >
> > > Thank you all -- I have queued this and pushed it to my RCU tree on
> > > branch lkmm. I did reword the commit log a bit, please see below and
> > > please let me know if any of my rewordings need halp.
> > >
> > > Andrea, when you resend your second patch, could you please add Alan's
> > > Acked-by?
> >
> > You mean in order to integrate Will's suggestion? I was planning to send
> > that as a separate patch, as suggested by Will: the patch is on its way,
> > IAC, please let me know if you'd prefer a V2 merging the two changes.
>
> Ah, apologies, I misread your reply. I have queued your second patch
> with Will's and Alan's Acked-by's.
And I did reword the commit log a bit, so please check it.
Thanx, Paul
------------------------------------------------------------------------
commit 12a62a1d07031c0afa396b03334abbe30d9b9cf7
Author: Andrea Parri <parri.and...@gmail.com>
Date: Thu Feb 1 13:04:26 2018 +0100
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 <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>
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/
