diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-10 16:41:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-10 16:41:09 -0700 |
commit | 85e97be32c6242c98dbbc7a241b4a78c1b93327b (patch) | |
tree | 97100c8015b091196a0d6fc64137324b94f6c58a /mm/hugetlb.c | |
parent | 7de249964f5578e67b99699c5f0b405738d820a2 (diff) | |
parent | 6039892396d845b18228935561960441900cffca (diff) | |
download | linux-stable-85e97be32c6242c98dbbc7a241b4a78c1b93327b.tar.gz linux-stable-85e97be32c6242c98dbbc7a241b4a78c1b93327b.tar.bz2 linux-stable-85e97be32c6242c98dbbc7a241b4a78c1b93327b.zip |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"8 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/slub.c: run free_partial() outside of the kmem_cache_node->list_lock
rmap: fix compound check logic in page_remove_file_rmap
mm, rmap: fix false positive VM_BUG() in page_add_file_rmap()
mm/page_alloc.c: recalculate some of node threshold when on/offline memory
mm/page_alloc.c: fix wrong initialization when sysctl_min_unmapped_ratio changes
thp: move shmem_huge_enabled() outside of SYSFS ifdef
revert "ARM: keystone: dts: add psci command definition"
rapidio: dereferencing an error pointer
Diffstat (limited to 'mm/hugetlb.c')
0 files changed, 0 insertions, 0 deletions