David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-23 01:22:35 -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.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
cma_debug.c	mm/cma_debug.c: remove blank lines before DEFINE_SIMPLE_ATTRIBUTE()	2015-04-15 16:35:20 -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.c	mm: hugetlb: cleanup using paeg_huge_active()	2015-04-15 16:35:19 -07:00
hugetlb_cgroup.c
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	gfp: add __GFP_NOACCOUNT	2015-05-14 17:55:51 -07:00
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-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
memory_hotplug.c	mm: hugetlb: cleanup using paeg_huge_active()	2015-04-15 16:35:19 -07:00
mempolicy.c	mm, numa: really disable NUMA balancing by default on single node machines	2015-05-14 17:55:51 -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-writeback.c	writeback: use |1 instead of +1 to protect against div by zero	2015-04-23 10:36:33 -06: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	CMA: page_isolation: check buddy before accessing it	2015-05-14 17:55:51 -07:00
page_owner.c
pagewalk.c
percpu-km.c
percpu-vm.c
percpu.c
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.c	mm: remove GFP_THISNODE	2015-04-14 16:49:03 -07:00
slab.h
slab_common.c
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.c	mm: don't call __page_cache_release for hugetlb	2015-04-15 16:35:19 -07:00
swap_cgroup.c
swap_state.c	mm: remove rest of ACCESS_ONCE() usages	2015-04-15 16:35:18 -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