diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:31:19 -0500 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:31:19 -0500 | 
| commit | 4e19fd9395f92e0fa250595d2da06d2c427c15f5 (patch) | |
| tree | 02dfac7c7b69bd50776c26c1f84844d9726a63ea /net/unix/af_unix.c | |
| parent | 82d2a348bb9a1e265fe1c62e39341128ec014ed9 (diff) | |
| parent | 394532e4b639dd6ac6053f0d777fb86948f29233 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
 "11 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  .mailmap: add Christophe Ricard
  Make CONFIG_FHANDLE default y
  mm/page_isolation.c: fix the function comments
  oom, oom_reaper: do not enqueue task if it is on the oom_reaper_list head
  mm/page_isolation: fix tracepoint to mirror check function behavior
  mm/rmap: batched invalidations should use existing api
  x86/mm: TLB_REMOTE_SEND_IPI should count pages
  mm: fix invalid node in alloc_migrate_target()
  include/linux/huge_mm.h: return NULL instead of false for pmd_trans_huge_lock()
  mm, kasan: fix compilation for CONFIG_SLAB
  MAINTAINERS: orangefs mailing list is subscribers-only
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions
