David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-10-23 16:49:34 -04:00

..

backing-dev.c

mm/backing-dev.c: check user buffer length before copying data to the related user buffer

2013-09-11 15:58:03 -07:00

balloon_compaction.c

…

bootmem.c

…

bounce.c

mm/bounce.c: fix a regression where MS_SNAP_STABLE (stable pages snapshotting) was ignored

2013-09-30 14:31:02 -07:00

cleancache.c

…

compaction.c

mm/compaction.c: periodically schedule when freeing pages

2013-09-30 14:31:01 -07:00

debug-pagealloc.c

…

dmapool.c

…

fadvise.c

…

failslab.c

…

filemap_xip.c

…

filemap.c

mm: memcg: handle non-error OOM situations more gracefully

2013-10-16 21:35:53 -07:00

fremap.c

…

frontswap.c

…

highmem.c

…

huge_memory.c

mm: fix BUG in __split_huge_page_pmd

2013-10-16 21:35:53 -07:00

hugetlb_cgroup.c

…

hugetlb.c

mm: hugetlb: initialize PG_reserved for tail pages of gigantic compound pages

2013-10-16 21:35:52 -07:00

hwpoison-inject.c

mm/hwpoison: fix the lack of one reference count against poisoned page

2013-09-30 14:31:03 -07:00

init-mm.c

…

internal.h

mm: vmscan: fix do_try_to_free_pages() livelock

2013-09-11 15:58:01 -07:00

interval_tree.c

…

Kconfig

powerpc: Fix memory hotplug with sparse vmemmap

2013-10-03 17:21:38 +10:00

Kconfig.debug

…

kmemcheck.c

…

kmemleak-test.c

…

kmemleak.c

mm: replace strict_strtoul() with kstrtoul()

2013-09-11 15:57:11 -07:00

ksm.c

mm: replace strict_strtoul() with kstrtoul()

2013-09-11 15:57:11 -07:00

list_lru.c

list_lru: dynamically adjust node arrays

2013-09-10 18:56:32 -04:00

maccess.c

…

madvise.c

mm/hwpoison: fix traversal of hugetlbfs pages to avoid printk flood

2013-09-30 14:31:02 -07:00

Makefile

list: add a new LRU list type

2013-09-10 18:56:30 -04:00

memblock.c

memblock, numa: binary search node id

2013-09-11 15:57:51 -07:00

memcontrol.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-10-23 16:49:34 -04:00

memory_hotplug.c

ACPI and power management fixes for 3.12-rc1

2013-09-12 11:22:45 -07:00

memory-failure.c

mm/hwpoison: fix false report on 2nd attempt at page recovery

2013-09-30 14:31:02 -07:00

memory.c

mm: memcg: handle non-error OOM situations more gracefully

2013-10-16 21:35:53 -07:00

mempolicy.c

mbind: add BUG_ON(!vma) in new_vma_page()

2013-09-11 15:57:50 -07:00

mempool.c

mm/mempool.c: convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)

2013-09-11 15:58:14 -07:00

migrate.c

mm: migration: do not lose soft dirty bit if page is in migration state

2013-10-16 21:35:52 -07:00

mincore.c

…

mlock.c

mm/mlock.c: prevent walking off the end of a pagetable in no-pmd configuration

2013-09-30 14:31:02 -07:00

mm_init.c

…

mmap.c

mm/mmap: remove unnecessary assignment

2013-09-11 15:58:13 -07:00

mmu_context.c

…

mmu_notifier.c

…

mmzone.c

…

mprotect.c

mm: migration: do not lose soft dirty bit if page is in migration state

2013-10-16 21:35:52 -07:00

mremap.c

mm: revert mremap pud_free anti-fix

2013-10-16 21:35:53 -07:00

msync.c

…

nobootmem.c

…

nommu.c

…

oom_kill.c

mm: memcg: handle non-error OOM situations more gracefully

2013-10-16 21:35:53 -07:00

page_alloc.c

revert "mm/memory-hotplug: fix lowmem count overflow when offline pages"

2013-09-30 14:31:01 -07:00

page_cgroup.c

…

page_io.c

…

page_isolation.c

mm: memory-hotplug: enable memory hotplug to handle hugepage

2013-09-11 15:57:48 -07:00

page-writeback.c

writeback: fix negative bdi max pause

2013-10-16 21:35:53 -07:00

pagewalk.c

…

percpu-km.c

…

percpu-vm.c

…

percpu.c

…

pgtable-generic.c

mm: move pgtable related functions to right place

2013-09-11 15:57:30 -07:00

process_vm_access.c

…

quicklist.c

…

readahead.c

readahead: make context readahead more conservative

2013-09-11 15:57:39 -07:00

rmap.c

thp: account anon transparent huge pages into NR_ANON_PAGES

2013-09-12 15:38:03 -07:00

shmem.c

initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled

2013-09-11 15:59:37 -07:00

slab_common.c

slab_common: Do not check for duplicate slab names

2013-09-28 09:47:41 +03:00

slab.c

…

slab.h

…

slob.c

mm/sl[aou]b: Move kmallocXXX functions to common code

2013-09-04 20:51:33 +03:00

slub.c

Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

2013-09-15 07:15:06 -04:00

sparse-vmemmap.c

…

sparse.c

mm/sparse: introduce alloc_usemap_and_memmap

2013-09-11 15:58:01 -07:00

swap_state.c

lib/radix-tree.c: make radix_tree_node_alloc() work correctly within interrupt

2013-09-11 15:59:36 -07:00

swap.c

mm: make lru_add_drain_all() selective

2013-09-12 15:38:02 -07:00

swapfile.c

swap: fix set_blocksize race during swapon/swapoff

2013-10-16 21:35:53 -07:00

truncate.c

truncate: drop 'oldsize' truncate_pagecache() parameter

2013-09-12 15:38:02 -07:00

util.c

swap: clean-up #ifdef in page_mapping()

2013-09-11 15:57:31 -07:00

vmalloc.c

mm/vmalloc: use wrapper function get_vm_area_size to caculate size of vm area

2013-09-11 15:58:02 -07:00

vmpressure.c

Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2013-09-03 18:25:03 -07:00

vmscan.c

mm/vmscan.c: don't forget to free shrinker->nr_deferred

2013-10-16 21:35:52 -07:00

vmstat.c

mm: vmscan: fix do_try_to_free_pages() livelock

2013-09-11 15:58:01 -07:00

zbud.c

mm/zbud: fix some trivial typos in comments

2013-09-11 15:57:35 -07:00

zswap.c

mm/zswap: bugfix: memory leak when re-swapon

2013-10-16 21:35:52 -07:00