James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ...

Conflicts:
	fs/attr.c

Resolve conflict manually.

Signed-off-by: James Morris <jmorris@namei.org>

2011-08-09 10:31:03 +10:00

..

backing-dev.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback

2011-07-26 10:39:54 -07:00

bootmem.c

…

bounce.c

…

cleancache.c

…

compaction.c

mm: compaction: abort compaction if too many pages are isolated and caller is asynchronous V2

2011-06-15 20:04:02 -07:00

debug-pagealloc.c

…

dmapool.c

devres: fix possible use after free

2011-07-25 20:57:14 -07:00

fadvise.c

…

failslab.c

fault-injection: add ability to export fault_attr in arbitrary directory

2011-08-03 14:25:20 -10:00

filemap_xip.c

…

filemap.c

mm: clarify the radix_tree exceptional cases

2011-08-03 14:25:24 -10:00

fremap.c

…

highmem.c

…

huge_memory.c

mm/huge_memory.c: minor lock simplification in __khugepaged_exit

2011-07-25 20:57:09 -07:00

hugetlb.c

mm: hugetlb: fix coding style issues

2011-07-25 20:57:09 -07:00

hwpoison-inject.c

…

init-mm.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

internal.h

…

Kconfig

…

Kconfig.debug

…

kmemcheck.c

…

kmemleak-test.c

…

kmemleak.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

ksm.c

ksm: fix NULL pointer dereference in scan_get_next_rmap_item()

2011-06-15 20:04:02 -07:00

maccess.c

…

madvise.c

fs: kill i_alloc_sem

2011-07-20 20:47:46 -04:00

Makefile

…

memblock.c

mm/memblock.c: avoid abuse of RED_INACTIVE

2011-07-25 20:57:09 -07:00

memcontrol.c

tmpfs: convert mem_cgroup shmem to radix-swap

2011-08-03 14:25:24 -10:00

memory_hotplug.c

mm: extend memory hotplug API to allow memory hotplug in virtual machines

2011-07-25 20:57:08 -07:00

memory-failure.c

HWPoison: add memory_failure_queue()

2011-08-03 11:15:58 -04:00

memory.c

mm/futex: fix futex writes on archs with SW tracking of dirty & young

2011-07-25 20:57:11 -07:00

mempolicy.c

cpusets: randomize node rotor used in cpuset_mem_spread_node()

2011-07-26 16:49:43 -07:00

mempool.c

…

migrate.c

migrate: don't account swapcache as shmem

2011-06-16 15:01:24 -07:00

mincore.c

mm: clarify the radix_tree exceptional cases

2011-08-03 14:25:24 -10:00

mlock.c

…

mm_init.c

…

mmap.c

mmap: fix and tidy up overcommit page arithmetic

2011-07-25 20:57:09 -07:00

mmu_context.c

…

mmu_notifier.c

…

mmzone.c

…

mprotect.c

…

mremap.c

…

msync.c

…

nobootmem.c

…

nommu.c

mmap: fix and tidy up overcommit page arithmetic

2011-07-25 20:57:09 -07:00

oom_kill.c

oom: task->mm == NULL doesn't mean the memory was freed

2011-08-01 15:24:12 -10:00

page_alloc.c

fault-injection: add ability to export fault_attr in arbitrary directory

2011-08-03 14:25:20 -10:00

page_cgroup.c

mm/page_cgroup.c: simplify code by using SECTION_ALIGN_UP() and SECTION_ALIGN_DOWN() macros

2011-07-25 20:57:09 -07:00

page_io.c

…

page_isolation.c

…

page-writeback.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback

2011-07-26 10:39:54 -07:00

pagewalk.c

pagewalk: fix code comment for THP

2011-07-25 20:57:09 -07:00

percpu-km.c

…

percpu-vm.c

…

percpu.c

…

pgtable-generic.c

…

prio_tree.c

…

quicklist.c

…

readahead.c

…

rmap.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback

2011-07-26 10:39:54 -07:00

shmem.c

Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next

2011-08-09 10:31:03 +10:00

slab.c

slab, lockdep: Annotate the locks before using them

2011-08-04 10:18:00 +02:00

slob.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

slub.c

Merge branch 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

2011-07-30 08:21:48 -10:00

sparse-vmemmap.c

…

sparse.c

mm: make some struct page's const

2011-07-25 20:57:07 -07:00

swap_state.c

…

swap.c

…

swapfile.c

mm: let swap use exceptional entries

2011-08-03 14:25:22 -10:00

thrash.c

mm: swap-token: add a comment for priority aging

2011-07-25 20:57:08 -07:00

truncate.c

mm: a few small updates for radix-swap

2011-08-03 14:25:24 -10:00

util.c

…

vmalloc.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

vmscan.c

memcg: add memory.vmscan_stat

2011-07-26 16:49:42 -07:00

vmstat.c

…