diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 19:42:28 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 19:42:28 -0700 | 
| commit | 84787c572d402644dca4874aba73324d9f8e3948 (patch) | |
| tree | 31783e50b09fee00ee7ff87c0c9708a3c7106482 /net/unix/af_unix.c | |
| parent | d62a0234c87f1457a3d2ba519ef90cf164a5eb23 (diff) | |
| parent | c5d2cac0f1caaf7dd21350146fb29c55b3e74249 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton:
 - Oleg's "wait/ptrace: assume __WALL if the child is traced".  It's a
   kernel-based workaround for existing userspace issues.
 - A few hotfixes
 - befs cleanups
 - nilfs2 updates
 - sys_wait() changes
 - kexec updates
 - kdump
 - scripts/gdb updates
 - the last of the MM queue
 - a few other misc things
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (84 commits)
  kgdb: depends on VT
  drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
  drm/radeon: make radeon_mn_get wait for mmap_sem killable
  drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
  uprobes: wait for mmap_sem for write killable
  prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
  exec: make exec path waiting for mmap_sem killable
  aio: make aio_setup_ring killable
  coredump: make coredump_wait wait for mmap_sem for write killable
  vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
  ipc, shm: make shmem attach/detach wait for mmap_sem killable
  mm, fork: make dup_mmap wait for mmap_sem for write killable
  mm, proc: make clear_refs killable
  mm: make vm_brk killable
  mm, elf: handle vm_brk error
  mm, aout: handle vm_brk failures
  mm: make vm_munmap killable
  mm: make vm_mmap killable
  mm: make mmap_sem for write waits killable for mm syscalls
  MAINTAINERS: add co-maintainer for scripts/gdb
  ...
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions
