David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
kasan	mm/mempool.c: kasan: poison mempool elements	2015-04-15 16:35:20 -07:00
backing-dev.c
balloon_compaction.c
bootmem.c
cleancache.c	cleancache: remove limit on the number of cleancache enabled filesystems	2015-04-14 16:49:03 -07:00
cma_debug.c	mm/cma_debug.c: remove blank lines before DEFINE_SIMPLE_ATTRIBUTE()	2015-04-15 16:35:20 -07:00
cma.c	mm: cma: add trace events for CMA allocations and freeings	2015-04-15 16:35:19 -07:00
cma.h	mm: cma: allocation trigger	2015-04-14 16:49:00 -07:00
compaction.c	mm/compaction.c: fix "suitable_migration_target() unused" warning	2015-04-15 16:35:20 -07:00
debug-pagealloc.c
debug.c
dmapool.c
early_ioremap.c
fadvise.c
failslab.c
filemap.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-04-16 23:27:56 -04:00
frontswap.c
gup.c	mm: use READ_ONCE() for non-scalar types	2015-04-15 16:35:18 -07:00
highmem.c
huge_memory.c	thp: cleanup khugepaged startup	2015-04-15 16:35:19 -07:00
hugetlb_cgroup.c
hugetlb.c	mm: hugetlb: cleanup using paeg_huge_active()	2015-04-15 16:35:19 -07:00
hwpoison-inject.c	mm/hwpoison-inject: check PageLRU of hpage	2015-05-05 17:10:11 -07:00
init-mm.c
internal.h	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
interval_tree.c
Kconfig	mm: cma: debugfs interface	2015-04-14 16:49:00 -07:00
Kconfig.debug
kmemcheck.c
kmemleak-test.c
kmemleak.c
ksm.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
list_lru.c
maccess.c
madvise.c
Makefile	mm: move memtest under mm	2015-04-14 16:49:06 -07:00
memblock.c	mm/memblock.c: add debug output for memblock_add()	2015-04-15 16:35:19 -07:00
memcontrol.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
memory_hotplug.c	mm: hugetlb: cleanup using paeg_huge_active()	2015-04-15 16:35:19 -07:00
memory-failure.c	mm: soft-offline: fix num_poisoned_pages counting on concurrent events	2015-05-05 17:10:10 -07:00
memory.c	mm: new pfn_mkwrite same as page_mkwrite for VM_PFNMAP	2015-04-15 16:35:20 -07:00
mempolicy.c	mm, thp: really limit transparent hugepage allocation to local node	2015-04-14 16:49:03 -07:00
mempool.c	mm/mempool.c: kasan: poison mempool elements	2015-04-15 16:35:20 -07:00
memtest.c	memtest: use phys_addr_t for physical addresses	2015-04-14 16:49:06 -07:00
migrate.c	mm/migrate: check-before-clear PageSwapCache	2015-04-15 16:35:17 -07:00
mincore.c
mlock.c	mm: move mm_populate()-related code to mm/gup.c	2015-04-14 16:49:00 -07:00
mm_init.c
mmap.c	mm/mmap.c: use while instead of if+goto	2015-04-15 16:35:19 -07:00
mmu_context.c
mmu_notifier.c
mmzone.c
mprotect.c	mm: numa: preserve PTE write permissions across a NUMA hinting fault	2015-03-25 16:20:31 -07:00
mremap.c	mm/mremap.c: clean up goto just return ERR_PTR	2015-04-15 16:35:18 -07:00
msync.c
nobootmem.c
nommu.c	nommu: use __vfs_read()	2015-04-11 22:27:56 -04:00
oom_kill.c	mm/oom_kill.c: fix typo in comment	2015-04-15 16:35:16 -07:00
page_alloc.c	mm/net: Rename and move page fragment handling from net/ to mm/	2015-05-12 10:39:26 -04:00
page_counter.c
page_ext.c
page_io.c	direct_IO: remove rw from a_ops->direct_IO()	2015-04-11 22:29:45 -04:00
page_isolation.c	mm/page_alloc.c: call kernel_map_pages in unset_migrateype_isolate	2015-03-25 16:20:30 -07:00
page_owner.c
page-writeback.c	writeback: use |1 instead of +1 to protect against div by zero	2015-04-23 10:36:33 -06:00
pagewalk.c	mm/pagewalk.c: prevent positive return value of walk_page_test() from being passed to callers	2015-03-25 16:20:30 -07:00
percpu-km.c
percpu-vm.c
percpu.c	percpu: Fix trivial typos in comments	2015-03-24 13:41:54 -04:00
pgtable-generic.c
process_vm_access.c	process_vm_access: switch to {compat_,}import_iovec()	2015-04-11 22:27:12 -04:00
quicklist.c
readahead.c
rmap.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
shmem.c	VFS: assorted weird filesystems: d_inode() annotations	2015-04-15 15:06:58 -04:00
slab_common.c
slab.c	mm: remove GFP_THISNODE	2015-04-14 16:49:03 -07:00
slab.h
slob.c	slob: make slob_alloc_node() static and remove EXPORT_SYMBOL()	2015-04-14 16:48:59 -07:00
slub.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
sparse-vmemmap.c
sparse.c
swap_cgroup.c
swap_state.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
swap.c	mm: don't call __page_cache_release for hugetlb	2015-04-15 16:35:19 -07:00
swapfile.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -07:00
truncate.c	mm: rename deactivate_page to deactivate_file_page	2015-04-15 16:35:17 -07:00
util.c	mm: uninline and cleanup page-mapping related helpers	2015-04-15 16:35:19 -07:00
vmacache.c
vmalloc.c	mm/vmalloc: get rid of dirty bitmap inside vmap_block structure	2015-04-15 16:35:18 -07:00
vmpressure.c
vmscan.c
vmstat.c
workingset.c
zbud.c
zpool.c
zsmalloc.c	zsmalloc: remove extra cond_resched() in __zs_compact	2015-04-15 16:35:22 -07:00
zswap.c