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
..
backing-dev.c	Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block	2014-10-18 11:53:51 -07:00
balloon_compaction.c	mm/balloon_compaction: fix deflation when compaction is disabled	2014-10-29 16:33:15 -07:00
bootmem.c	mem-hotplug: reset node managed pages when hot-adding a new pgdat	2014-11-13 16:17:06 -08:00
cleancache.c	mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE	2014-01-23 16:36:50 -08:00
cma.c	mm: cma: split cma-reserved in dmesg log	2014-12-18 19:08:10 -08:00
compaction.c	mm, compaction: more focused lru and pcplists draining	2014-12-10 17:41:06 -08:00
debug-pagealloc.c	mm/debug-pagealloc: make debug-pagealloc boottime configurable	2014-12-13 12:42:48 -08:00
debug.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
dmapool.c	mm/dmapool.c: fixed a brace coding style issue	2014-10-09 22:26:00 -04:00
early_ioremap.c	mm: create generic early_ioremap() support	2014-04-07 16:36:15 -07:00
fadvise.c	mm: fadvise: document the fadvise(FADV_DONTNEED) behaviour for partial pages	2014-12-13 12:42:49 -08:00
failslab.c
filemap_xip.c	mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub	2015-02-10 14:30:30 -08:00
filemap.c	mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub	2015-02-10 14:30:30 -08:00
frontswap.c	mm/frontswap.c: fix the condition in BUG_ON	2014-12-10 17:41:08 -08:00
gup.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
highmem.c	mm/highmem: make kmap cache coloring aware	2014-08-06 18:01:22 -07:00
huge_memory.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-12-15 15:52:01 -08:00
hugetlb_cgroup.c	mm: hugetlb_cgroup: convert to lockless page counters	2014-12-10 17:41:04 -08:00
hugetlb.c	mm: hugetlb: fix type of hugetlb_treat_as_movable variable	2015-02-10 14:30:34 -08:00
hwpoison-inject.c	mm/hwpoison-inject.c: remove unnecessary null test before debugfs_remove_recursive	2014-08-06 18:01:19 -07:00
init-mm.c
internal.h	mm, compaction: always update cached scanner positions	2014-12-10 17:41:06 -08:00
interval_tree.c	mm: replace vma->sharead.linear with vma->shared	2015-02-10 14:30:31 -08:00
iov_iter.c	copy_from_iter_nocache()	2014-12-08 20:25:23 -05:00
Kconfig	rcu: Make SRCU optional by using CONFIG_SRCU	2015-01-06 11:04:29 -08:00
Kconfig.debug	mm/debug_pagealloc: remove obsolete Kconfig options	2015-01-08 15:10:52 -08:00
kmemcheck.c	mm/slab_common: move kmem_cache definition to internal header	2014-10-09 22:25:50 -04:00
kmemleak-test.c	mm/kmemleak-test.c: use pr_fmt for logging	2014-06-06 16:08:18 -07:00
kmemleak.c	mm: introduce kmemleak_update_trace()	2014-06-06 16:08:17 -07:00
ksm.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
list_lru.c	mm: keep page cache radix tree nodes in check	2014-04-03 16:21:01 -07:00
maccess.c
madvise.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
Makefile	mm: replace remap_file_pages() syscall with emulation	2015-02-10 14:30:30 -08:00
memblock.c	mm/memblock.c: refactor functions to set/clear MEMBLOCK_HOTPLUG	2014-12-13 12:42:46 -08:00
memcontrol.c	memcg: zap memcg_slab_caches and memcg_slab_mutex	2015-02-10 14:30:34 -08:00
memory_hotplug.c	mm, memory_hotplug/failure: drain single zone pcplists	2014-12-10 17:41:05 -08:00
memory-failure.c	mm: vmscan: invoke slab shrinkers from shrink_zone()	2014-12-13 12:42:48 -08:00
memory.c	Merge branch 'akpm' (patches from Andrew)	2015-02-10 16:45:56 -08:00
mempolicy.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-19 18:19:19 -08:00
mempool.c	mm/mempool.c: update the kmemleak stack trace for mempool allocations	2014-06-06 16:08:17 -07:00
migrate.c	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
mincore.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
mlock.c	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
mm_init.c	mm: bring back /sys/kernel/mm	2014-01-27 21:02:39 -08:00
mmap.c	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
mmu_context.c	sched/mm: call finish_arch_post_lock_switch in idle_task_exit and use_mm	2014-02-21 08:50:17 +01:00
mmu_notifier.c	mmu_notifier: add the callback for mmu_notifier_invalidate_range()	2014-11-13 13:46:09 +11:00
mmzone.c	mm: numa: Change page last {nid,pid} into {cpu,pid}	2013-10-09 14:47:45 +02:00
mprotect.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
mremap.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
msync.c	mm: remove rest usage of VM_NONLINEAR and pte_file()	2015-02-10 14:30:31 -08:00
nobootmem.c	mem-hotplug: reset node managed pages when hot-adding a new pgdat	2014-11-13 16:17:06 -08:00
nommu.c	mm: replace remap_file_pages() syscall with emulation	2015-02-10 14:30:30 -08:00
oom_kill.c	oom: kill the insufficient and no longer needed PT_TRACE_EXIT check	2014-12-13 12:42:49 -08:00
page_alloc.c	mm/page_alloc.c: place zone_id check before VM_BUG_ON_PAGE check	2015-02-10 14:30:34 -08:00
page_counter.c	mm: memcontrol: remove obsolete kmemcg pinning tricks	2014-12-10 17:41:05 -08:00
page_ext.c	mm/page_owner: keep track of page owners	2014-12-13 12:42:48 -08:00
page_io.c	fix __swap_writepage() compile failure on old gcc versions	2014-06-14 19:30:48 -05:00
page_isolation.c	mm, page_isolation: drain single zone pcplists	2014-12-10 17:41:05 -08:00
page_owner.c	mm/page_owner: correct owner information for early allocated pages	2014-12-13 12:42:48 -08:00
page-writeback.c	mm: protect set_page_dirty() from ongoing truncation	2015-01-08 15:10:51 -08:00
pagewalk.c	mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range	2015-02-05 13:35:29 -08:00
percpu-km.c	percpu: implmeent pcpu_nr_empty_pop_pages and chunk->nr_populated	2014-09-02 14:46:05 -04:00
percpu-vm.c	percpu: move region iterations out of pcpu_[de]populate_chunk()	2014-09-02 14:46:02 -04:00
percpu.c	percpu: off by one in BUG_ON()	2014-10-29 10:34:34 -04:00
pgtable-generic.c	mm: actually clear pmd_numa before invalidating	2014-08-29 16:28:15 -07:00
process_vm_access.c	start adding the tag to iov_iter	2014-05-06 17:32:49 -04:00
quicklist.c
readahead.c	mm/readahead.c: remove unused file_ra_state from count_history_pages	2014-08-06 18:01:15 -07:00
rmap.c	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
shmem.c	mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub	2015-02-10 14:30:30 -08:00
slab_common.c	memcg: zap memcg_slab_caches and memcg_slab_mutex	2015-02-10 14:30:34 -08:00
slab.c	slab: fix cpuset check in fallback_alloc	2014-12-13 12:42:53 -08:00
slab.h	memcg: zap __memcg_{charge,uncharge}_slab	2015-02-10 14:30:34 -08:00
slob.c	mm/sl[ao]b: always track caller in kmalloc_(node_)track_caller()	2014-10-09 22:25:50 -04:00
slub.c	mm/slub.c: fix typo in comment	2015-02-10 14:30:30 -08:00
sparse-vmemmap.c	mm/sparse: use memblock apis for early memory allocations	2014-01-21 16:19:47 -08:00
sparse.c	mm: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:35:54 -07:00
swap_cgroup.c	mm: page_cgroup: rename file to mm/swap_cgroup.c	2014-12-10 17:41:09 -08:00
swap_state.c	mm: page_cgroup: rename file to mm/swap_cgroup.c	2014-12-10 17:41:09 -08:00
swap.c	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
swapfile.c	mm: page_cgroup: rename file to mm/swap_cgroup.c	2014-12-10 17:41:09 -08:00
truncate.c	mm: Fix comment before truncate_setsize()	2014-11-07 08:29:25 +11:00
util.c	proc/maps: make vm_is_stack() logic namespace-friendly	2014-10-09 22:25:50 -04:00
vmacache.c	mm,vmacache: count number of system-wide flushes	2014-12-13 12:42:48 -08:00
vmalloc.c	mm/vmalloc.c: fix memory ordering bug	2014-12-13 12:42:49 -08:00
vmpressure.c	mm/vmpressure.c: fix race in vmpressure_work_fn()	2014-12-02 17:32:07 -08:00
vmscan.c	mm/vmscan: fix highidx argument type	2015-01-26 13:37:18 -08:00
vmstat.c	mm/vmstat.c: fix/cleanup ifdefs	2015-02-10 14:30:30 -08:00
workingset.c	mm: keep page cache radix tree nodes in check	2014-04-03 16:21:01 -07:00
zbud.c	mm/zbud: init user ops only when it is needed	2014-12-13 12:42:51 -08:00
zpool.c	mm/zpool: use prefixed module loading	2014-08-29 16:28:16 -07:00
zsmalloc.c	mm/zsmalloc: adjust order of functions	2014-12-18 19:08:11 -08:00
zswap.c	mm/zswap: delete unnecessary check before calling free_percpu()	2014-12-13 12:42:50 -08:00