diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:34:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:34:09 -0700 |
commit | 01b0c014eeb0bb857a5dc572cd108be7becddfe7 (patch) | |
tree | d6f1a089081aadb09e66add27f7c5137d076ac80 /MAINTAINERS | |
parent | 3ebb0540c20d6670396ccee9ff6794c095fa9311 (diff) | |
parent | e527b22c3f63c02832ac4cb8ed0ec3a9b638bbdf (diff) | |
download | linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.tar.gz linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.tar.bz2 linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.zip |
Merge branch 'akpm' (patches from Andrew)
Merge fourth patch-bomb from Andrew Morton:
- sys_membarier syscall
- seq_file interface changes
- a few misc fixups
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
revert "ocfs2/dlm: use list_for_each_entry instead of list_for_each"
mm/early_ioremap: add explicit #include of asm/early_ioremap.h
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
selftests: enhance membarrier syscall test
selftests: add membarrier syscall test
sys_membarrier(): system-wide memory barrier (generic, x86)
MODSIGN: fix a compilation warning in extract-cert
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 030d8724b476..7ba7ab749c85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6789,6 +6789,14 @@ W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/mellanox/mlxsw/ +MEMBARRIER SUPPORT +M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> +L: linux-kernel@vger.kernel.org +S: Supported +F: kernel/membarrier.c +F: include/uapi/linux/membarrier.h + MEMORY MANAGEMENT L: linux-mm@kvack.org W: http://www.linux-mm.org |