2015-05-22-14-48 merged
Adrien Schildknecht (1):
scripts/gdb: fix lx-lsmod refcnt
Andrea Arcangeli (27):
userfaultfd: linux/Documentation/vm/userfaultfd.txt
userfaultfd: documentation update
userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key
userfaultfd: uAPI
userfaultfd: linux/userfaultfd_k.h
userfaultfd: add vm_userfaultfd_ctx to the vm_area_struct
userfaultfd: add VM_UFFD_MISSING and VM_UFFD_WP
userfaultfd: call handle_userfault() for userfaultfd_missing() faults
userfaultfd: teach vma_merge to merge across vma->vm_userfaultfd_ctx
userfaultfd: prevent khugepaged to merge if userfaultfd is armed
userfaultfd: add new syscall to provide memory externalization
userfaultfd-add-new-syscall-to-provide-memory-externalization-fix
userfaultfd: fs/userfaultfd.c add more comments
userfaultfd: rename uffd_api.bits into .features fixup
userfaultfd: change the read API to return a uffd_msg
userfaultfd: documentation update
userfaultfd: wake pending userfaults
userfaultfd: optimize read() and poll() to be O(1)
userfaultfd: fs/userfaultfd.c add more comments
userfaultfd: allocate the userfaultfd_ctx cacheline aligned
userfaultfd: solve the race between UFFDIO_COPY|ZEROPAGE and read
userfaultfd: buildsystem activation
userfaultfd: activate syscall
userfaultfd: UFFDIO_COPY|UFFDIO_ZEROPAGE uAPI
userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation
userfaultfd: avoid mmap_sem read recursion in mcopy_atomic
userfaultfd: UFFDIO_COPY and UFFDIO_ZEROPAGE
Andrew Morton (5):
fs/binfmt_elf.c:load_elf_binary(): return -EINVAL on zero-length mappings
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix
fs/userfaultfd.c: work around i386 build error
hugetlb-do-not-account-hugetlb-pages-as-nr_file_pages-fix
mm-hugetlb-handle-races-in-alloc_huge_page-and-hugetlb_reserve_pages-fix
Aneesh Kumar K.V (2):
powerpc/mm: use generic version of pmdp_clear_flush()
mm: clarify that the function operates on hugepage pte
Bob Copeland (3):
omfs: set error return when d_make_root() fails
omfs: fix sign confusion for bitmap loop counter
omfs: fix potential integer overflow in allocator
Gu Zheng (1):
mm/memory hotplug: init the zone's size when calculating node totalpages
Joe Perches (1):
MAINTAINERS: update CAPABILITIES pattern
Johannes Weiner (7):
mm: oom_kill: remove unnecessary locking in oom_enable()
mm: oom_kill: clean up victim marking and exiting interfaces
mm: oom_kill: switch test-and-clear of known TIF_MEMDIE to clear
mm: oom_kill: generalize OOM progress waitqueue
mm: oom_kill: remove unnecessary locking in exit_oom_victim()
mm: oom_kill: simplify OOM killer locking
mm: page_alloc: inline should_alloc_retry()
Leon Romanovsky (1):
mm: nommu: refactor debug and warning prints
Mel Gorman (1):
mm, memcg: Try charging a page before setting page up to date
Michal Hocko (8):
Reverted "cma-page_isolation-check-buddy-before-access-it-fix"
Reverted "CMA: page_isolation: check buddy before accessing it"
Revert "mm/mmap.c: fix off-by-one in mmap overflow check"
Reverted "mm/hugetlb: initialize order with UINT_MAX in dissolve_free_huge_pages()"
Reverted "mm-thp-split-out-pmd-collpase-flush-into-a-separate-functions-fix"
Reverted "mm: clarify that the function operateds on hugepage pte"
Reverted "powerpc/mm: use generic version of pmdp_clear_flush"
hugetlb: do not account hugetlb pages as NR_FILE_PAGES
Mike Kravetz (2):
mm/hugetlb: compute/return the number of regions added by region_add()
mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages
Namhyung Kim (1):
tracing, mm: Record pfn instead of pointer to struct page
Naoya Horiguchi (3):
mm-memory-failure-split-thp-earlier-in-memory-error-handling-v2
mm-memory-failure-introduce-get_hwpoison_page-for-consistent-refcount-handling-v2
mm/hugetlb: introduce minimum hugepage order
Pavel Emelyanov (1):
userfaultfd: Rename uffd_api.bits into .features
Sasha Levin (1):
fs, omfs: add NULL terminator in the end up the token list
Sergey Senozhatsky (2):
zram: cosmetic zram_bvec_write() cleanup
zram: cut trailing newline in algorithm name
Shreyas B. Prabhu (3):
tracing-mm-dont-trace-kmem_cache_free-on-offline-cpus-fix
tracing-mm-dont-trace-mm_page_free-on-offline-cpus-fix
tracing-mm-dont-trace-mm_page_pcpu_drain-on-offline-cpus-fix
Steven Rostedt (Red Hat) (8):
tracing: Give system name a pointer
tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values
tracing: Add TRACE_SYSTEM_VAR to intel-sst
tracing: Add TRACE_SYSTEM_VAR to kvm-s390
tracing: Add TRACE_SYSTEM_VAR to xhci-hcd
mac80211: Move message tracepoints to their own header
iwlwifi: Move each system tracepoints to their own header
brcmsmac: Move each system tracepoints to their own header
Xie XiuQi (1):
tracing: fix build error in mm/memory-failure.c
zram: cut trailing newline in algorithm name
Supplied sysfs values sometimes contain new-line symbols (echo vs. echo
-n), which we also copy as a compression algorithm name. it works fine
when we lookup for compression algorithm, because we use sysfs_streq()
which takes care of new line symbols. however, it doesn't look nice when
we print compression algorithm name if zcomp_create() failed:
zram: Cannot initialise LXZ
compressing backend
cut trailing new-line, so the error string will look like
zram: Cannot initialise LXZ compressing backend
we also now can replace sysfs_streq() in zcomp_available_show() with
strcmp().
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2 files changed
