diff options
| author | Linus Torvalds | 2016-05-27 14:56:59 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-27 14:56:59 -0700 |
| commit | af7d93729c7c2beadea8ec5a6e66c53bef0e6290 (patch) | |
| tree | d807ab034c13fe7e758c8ca11fb8ee38e9ceb38c /MAINTAINERS | |
| parent | 564884fbdecaea56fb65f2f32963059d3049b967 (diff) | |
| parent | 11e685672a0861ce136cc4e7f6fdd11e5390b1fa (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc updates and fixes from Andrew Morton:
- late-breaking ocfs2 updates
- random bunch of fixes
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: disable DEFERRED_STRUCT_PAGE_INIT on !NO_BOOTMEM
mm/memcontrol.c: move comments for get_mctgt_type() to proper position
mm/memcontrol.c: fix the margin computation in mem_cgroup_margin()
mm/cma: silence warnings due to max() usage
mm: thp: avoid false positive VM_BUG_ON_PAGE in page_move_anon_rmap()
oom_reaper: close race with exiting task
mm: use early_pfn_to_nid in register_page_bootmem_info_node
mm: use early_pfn_to_nid in page_ext_init
MAINTAINERS: Kdump maintainers update
MAINTAINERS: add kexec_core.c and kexec_file.c
mm: oom: do not reap task if there are live threads in threadgroup
direct-io: fix direct write stale data exposure from concurrent buffered read
ocfs2: bump up o2cb network protocol version
ocfs2: o2hb: fix hb hung time
ocfs2: o2hb: don't negotiate if last hb fail
ocfs2: o2hb: add some user/debug log
ocfs2: o2hb: add NEGOTIATE_APPROVE message
ocfs2: o2hb: add NEGO_TIMEOUT message
ocfs2: o2hb: add negotiate timer
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f2d7337ebdb3..f466673f86ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6421,8 +6421,9 @@ F: Documentation/kbuild/kconfig-language.txt F: scripts/kconfig/ KDUMP -M: Vivek Goyal <vgoyal@redhat.com> -M: Haren Myneni <hbabu@us.ibm.com> +M: Dave Young <dyoung@redhat.com> +M: Baoquan He <bhe@redhat.com> +R: Vivek Goyal <vgoyal@redhat.com> L: kexec@lists.infradead.org W: http://lse.sourceforge.net/kdump/ S: Maintained @@ -6568,7 +6569,7 @@ L: kexec@lists.infradead.org S: Maintained F: include/linux/kexec.h F: include/uapi/linux/kexec.h -F: kernel/kexec.c +F: kernel/kexec* KEYS/KEYRINGS: M: David Howells <dhowells@redhat.com> |