diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-08-01 09:27:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-08-01 09:27:22 +0200 |
| commit | a68415c27ff366970be132c266aa859ad706af33 (patch) | |
| tree | 3edbba27e5c34c385f6ee5130ddac19c3c3c7959 /MAINTAINERS | |
| parent | Merge branch 'kcsan' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck... (diff) | |
| parent | Documentation/litmus-tests: Add note on herd7 7.56 in atomic litmus test (diff) | |
| download | linux-a68415c27ff366970be132c266aa859ad706af33.tar.xz linux-a68415c27ff366970be132c266aa859ad706af33.zip | |
Merge branch 'lkmm' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into locking/core
Pull v5.9 LKMM changes from Paul E. McKenney.
Mostly documentation changes, but also some new litmus tests for atomic ops.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f0569cf304ca..e8aedeb71f9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9972,6 +9972,7 @@ M: Luc Maranget <luc.maranget@inria.fr> M: "Paul E. McKenney" <paulmck@kernel.org> R: Akira Yokosawa <akiyks@gmail.com> R: Daniel Lustig <dlustig@nvidia.com> +R: Joel Fernandes <joel@joelfernandes.org> L: linux-kernel@vger.kernel.org L: linux-arch@vger.kernel.org S: Supported @@ -9980,6 +9981,7 @@ F: Documentation/atomic_bitops.txt F: Documentation/atomic_t.txt F: Documentation/core-api/atomic_ops.rst F: Documentation/core-api/refcount-vs-atomic.rst +F: Documentation/litmus-tests/ F: Documentation/memory-barriers.txt F: tools/memory-model/ |