]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 06:40:29 +0000 (22:40 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 06:40:29 +0000 (22:40 -0800)
commit6bbce8b460ef3285c10a188a0e87e544c059bab9
treee8c90e5b9b57fbd977d602242aebdf135ae9e5bd
parent70e792b74c887f78a0fb3bbac374e53d4d4a263c
parent7c906218b7d4cdb5eac724d20bbe80e489f21a18
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/upstream-cherry-picks: (55 commits)
  userfaultfd: fix SIGBUS resulting from false rwsem wakeups
  userfaultfd: hugetlbfs: fix add copy_huge_page_from_user for hugetlb userfaultfd support
  userfaultfd: hugetlbfs: reserve count on error in __mcopy_atomic_hugetlb
  userfaultfd: hugetlbfs: gup: support VM_FAULT_RETRY
  userfaultfd: hugetlbfs: userfaultfd_huge_must_wait for hugepmd ranges
  userfaultfd: hugetlbfs: add userfaultfd_hugetlb test
  userfaultfd: hugetlbfs: allow registration of ranges containing huge pages
  userfaultfd: hugetlbfs: add userfaultfd hugetlb hook
  userfaultfd: hugetlbfs: fix __mcopy_atomic_hugetlb retry/error processing
  userfaultfd: hugetlbfs: add __mcopy_atomic_hugetlb for huge page UFFDIO_COPY
  userfaultfd: hugetlbfs: add hugetlb_mcopy_atomic_pte for userfaultfd support
  userfaultfd: hugetlbfs: add copy_huge_page_from_user for hugetlb userfaultfd support
  mm/hugetlb: fix huge page reservation leak in private mapping error paths
  mm/hugetlb: fix huge page reserve accounting for private mappings
  userfaultfd: don't pin the user memory in userfaultfd_file_create()
  userfaultfd: don't block on the last VM updates at exit time
  sparc: add waitfd to 32 bit system call tables
  userfaultfd: remove kernel header include from uapi header
  userfaultfd: register uapi generic syscall (aarch64)
  userfaultfd: selftest: don't error out if pthread_mutex_t isn't identical
  ...

Conflicts:
arch/x86/syscalls/syscall_32.tbl
arch/x86/syscalls/syscall_64.tbl
fs/Makefile
include/linux/mm_types.h
mm/hugetlb.c
18 files changed:
arch/sparc/kernel/systbls_64.S
arch/x86/syscalls/syscall_32.tbl
arch/x86/syscalls/syscall_64.tbl
fs/Makefile
include/linux/mm.h
include/linux/mm_types.h
include/linux/sched.h
include/uapi/linux/Kbuild
init/Kconfig
kernel/fork.c
kernel/sys_ni.c
mm/gup.c
mm/huge_memory.c
mm/hugetlb.c
mm/memory.c
mm/mempolicy.c
mm/mlock.c
mm/mmap.c