diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 14:56:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 14:56:59 -0700 |
commit | af7d93729c7c2beadea8ec5a6e66c53bef0e6290 (patch) | |
tree | d807ab034c13fe7e758c8ca11fb8ee38e9ceb38c /mm/mmap.c | |
parent | 564884fbdecaea56fb65f2f32963059d3049b967 (diff) | |
parent | 11e685672a0861ce136cc4e7f6fdd11e5390b1fa (diff) | |
download | linux-next-af7d93729c7c2beadea8ec5a6e66c53bef0e6290.tar.gz |
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 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions