linux/arch
Linus Torvalds 992de5a8ec Merge branch 'akpm' (patches from Andrew)
Merge misc updates from Andrew Morton:
 "Bite-sized chunks this time, to avoid the MTA ratelimiting woes.

   - fs/notify updates

   - ocfs2

   - some of MM"

That laconic "some MM" is mainly the removal of remap_file_pages(),
which is a big simplification of the VM, and which gets rid of a *lot*
of random cruft and special cases because we no longer support the
non-linear mappings that it used.

From a user interface perspective, nothing has changed, because the
remap_file_pages() syscall still exists, it's just done by emulating the
old behavior by creating a lot of individual small mappings instead of
one non-linear one.

The emulation is slower than the old "native" non-linear mappings, but
nobody really uses or cares about remap_file_pages(), and simplifying
the VM is a big advantage.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
  memcg: zap memcg_slab_caches and memcg_slab_mutex
  memcg: zap memcg_name argument of memcg_create_kmem_cache
  memcg: zap __memcg_{charge,uncharge}_slab
  mm/page_alloc.c: place zone_id check before VM_BUG_ON_PAGE check
  mm: hugetlb: fix type of hugetlb_treat_as_movable variable
  mm, hugetlb: remove unnecessary lower bound on sysctl handlers"?
  mm: memory: merge shared-writable dirtying branches in do_wp_page()
  mm: memory: remove ->vm_file check on shared writable vmas
  xtensa: drop _PAGE_FILE and pte_file()-related helpers
  x86: drop _PAGE_FILE and pte_file()-related helpers
  unicore32: drop pte_file()-related helpers
  um: drop _PAGE_FILE and pte_file()-related helpers
  tile: drop pte_file()-related helpers
  sparc: drop pte_file()-related helpers
  sh: drop _PAGE_FILE and pte_file()-related helpers
  score: drop _PAGE_FILE and pte_file()-related helpers
  s390: drop pte_file()-related helpers
  parisc: drop _PAGE_FILE and pte_file()-related helpers
  openrisc: drop _PAGE_FILE and pte_file()-related helpers
  nios2: drop _PAGE_FILE and pte_file()-related helpers
  ...
2015-02-10 16:45:56 -08:00
..
alpha alpha: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
arc arc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
arm Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
arm64 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
avr32 avr32: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
blackfin blackfin: drop pte_file() 2015-02-10 14:30:31 -08:00
c6x c6x: drop pte_file() 2015-02-10 14:30:32 -08:00
cris cris: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
frv Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
hexagon hexagon: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
ia64 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
m32r m32r: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
m68k Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
metag metag: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
microblaze Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
mips Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
mn10300 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
nios2 nios2: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
openrisc openrisc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
parisc parisc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
powerpc PCI changes for the v3.20 merge window: 2015-02-10 14:31:28 -08:00
s390 s390: drop pte_file()-related helpers 2015-02-10 14:30:33 -08:00
score score: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
sh sh: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
sparc sparc: drop pte_file()-related helpers 2015-02-10 14:30:33 -08:00
tile Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
um um: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
unicore32 unicore32: drop pte_file()-related helpers 2015-02-10 14:30:33 -08:00
x86 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
xtensa xtensa: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
.gitignore
Kconfig