• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · 6c0f568e
    Linus Torvalds authored
    Merge patch-bomb from Andrew Morton:
    
     - a few misc things
    
     - Andy's "ambient capabilities"
    
     - fs/nofity updates
    
     - the ocfs2 queue
    
     - kernel/watchdog.c updates and feature work.
    
     - some of MM.  Includes Andrea's userfaultfd feature.
    
    [ Hadn't noticed that userfaultfd was 'default y' when applying the
      patches, so that got fixed in this merge instead.  We do _not_ mark
      new features that nobody uses yet 'default y'   - Linus ]
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
      mm/hugetlb.c: make vma_has_reserves() return bool
      mm/madvise.c: make madvise_behaviour_valid() return bool
      mm/memory.c: make tlb_next_batch() return bool
      mm/dmapool.c: change is_page_busy() return from int to bool
      mm: remove struct node_active_region
      mremap: simplify the "overlap" check in mremap_to()
      mremap: don't do uneccesary checks if new_len == old_len
      mremap: don't do mm_populate(new_addr) on failure
      mm: move ->mremap() from file_operations to vm_operations_struct
      mremap: don't leak new_vma if f_op->mremap() fails
      mm/hugetlb.c: make vma_shareable() return bool
      mm: make GUP handle pfn mapping unless FOLL_GET is requested
      mm: fix status code which move_pages() returns for zero page
      mm: memcontrol: bring back the VM_BUG_ON() in mem_cgroup_swapout()
      genalloc: add support of multiple gen_pools per device
      genalloc: add name arg to gen_pool_get() and devm_gen_pool_create()
      mm/memblock: WARN_ON when nid differs from overlap region
      Documentation/features/vm: add feature description and arch support status for batched TLB flush after unmap
      mm: defer flush of writable TLB entries
      mm: send one IPI per CPU to TLB flush all entries after unmapping pages
      ...
    6c0f568e
Kconfig 65.1 KB