Skip to content
  • Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · 5b8b9d0c
    Linus Torvalds authored
    Merge yet more updates from Andrew Morton:
    
     - Almost all of the rest of MM (memcg, slab-generic, slab, pagealloc,
       gup, hugetlb, pagemap, memremap)
    
     - Various other things (hfs, ocfs2, kmod, misc, seqfile)
    
    * akpm: (34 commits)
      ipc/util.c: sysvipc_find_ipc() should increase position index
      kernel/gcov/fs.c: gcov_seq_next() should increase position index
      fs/seq_file.c: seq_read(): add info message about buggy .next functions
      drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings
      change email address for Pali Rohár
      selftests: kmod: test disabling module autoloading
      selftests: kmod: fix handling test numbers above 9
      docs: admin-guide: document the kernel.modprobe sysctl
      fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
      kmod: make request_module() return an error when autoloading is disabled
      mm/memremap: set caching mode for PCI P2PDMA memory to WC
      mm/memory_hotplug: add pgprot_t to mhp_params
      powerpc/mm: thread pgprot_t through create_section_mapping()
      x86/mm: introduce __set_memory_prot()
      x86/mm: thread pgprot_t through init_memory_mapping()
      mm/memory_hotplug: rename mhp_restrictions to mhp_params
      mm/memory_hotplug: drop the flags field from struct mhp_restrictions
      mm/special: create generic fallbacks for pte_special() and pte_mkspecial()
      mm/vma: introduce VM_ACCESS_FLAGS
      mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS
      ...
    5b8b9d0c