Tejun Heo edab95103d cgroup: Merge branch 'memcg_event' into for-3.14 ...

Merge v3.12 based patch series to move cgroup_event implementation to
memcg into for-3.14.  The following two commits cause a conflict in
kernel/cgroup.c

  2ff2a7d03bbe4 ("cgroup: kill css_id")
  79bd9814e5ec9 ("cgroup, memcg: move cgroup_event implementation to memcg")

Each patch removes a struct definition from kernel/cgroup.c.  As the
two are adjacent, they cause a context conflict.  Easily resolved by
removing both structs.

Signed-off-by: Tejun Heo <tj@kernel.org>

2013-11-22 18:32:25 -05: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

mm/bootmem.c: remove unused local `map'

2013-11-13 12:09:09 +09:00

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: update comment about zone lock in isolate_freepages_block

2013-11-13 12:09:03 +09:00

debug-pagealloc.c

…

dmapool.c

…

fadvise.c

…

failslab.c

…

filemap_xip.c

seqcount: Add lockdep functionality to seqcount/seqlock structures

2013-11-06 12:40:26 +01:00

filemap.c

mm: drop actor argument of do_generic_file_read()

2013-11-15 09:32:13 +09:00

fremap.c

mm: save soft-dirty bits on file pages

2013-08-13 17:57:48 -07:00

frontswap.c

…

highmem.c

…

huge_memory.c

mm: convert the rest to new page table lock api

2013-11-15 09:32:15 +09:00

hugetlb_cgroup.c

cgroup: pass around cgroup_subsys_state instead of cgroup in file methods

2013-08-08 20:11:24 -04:00

hugetlb.c

mm: hugetlbfs: fix hugetlbfs optimization

2013-11-21 16:42:27 -08: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

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

2013-11-15 16:47:22 -08:00

Kconfig.debug

…

kmemcheck.c

…

kmemleak-test.c

…

kmemleak.c

mm: kmemleak: avoid false negatives on vmalloc'ed objects

2013-11-13 12:09:07 +09:00

ksm.c

ksm: remove redundant __GFP_ZERO from kcalloc

2013-11-13 12:09:02 +09:00

list_lru.c

mm: list_lru: fix almost infinite loop causing effective livelock

2013-10-30 12:57:46 -07: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

mm/memblock.c: introduce bottom-up allocation mode

2013-11-13 12:09:08 +09:00

memcontrol.c

cgroup: Merge branch 'memcg_event' into for-3.14

2013-11-22 18:32:25 -05:00

memory_hotplug.c

mem-hotplug: introduce movable_node boot option

2013-11-13 12:09:09 +09:00

memory-failure.c

kfifo API type safety

2013-11-15 09:32:23 +09:00

memory.c

Revert "mm: create a separate slab for page->ptl allocation"

2013-11-20 14:41:47 -08:00

mempolicy.c

mm, mempolicy: silence gcc warning

2013-11-21 16:42:27 -08: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: thp: give transparent hugepage code a separate copy_page

2013-11-21 16:42:27 -08: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

mm: numa: Change page last {nid,pid} into {cpu,pid}

2013-10-09 14:47:45 +02:00

mmap.c

mm: convert mm->nr_ptes to atomic_long_t

2013-11-15 09:32:14 +09:00

mmu_context.c

…

mmu_notifier.c

…

mmzone.c

mm: numa: Change page last {nid,pid} into {cpu,pid}

2013-10-09 14:47:45 +02:00

mprotect.c

mm: numa: return the number of base pages altered by protection changes

2013-11-13 12:09:11 +09:00

mremap.c

mm: revert mremap pud_free anti-fix

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

msync.c

…

nobootmem.c

mm/nobootmem.c: have __free_pages_memory() free in larger chunks.

2013-11-13 12:09:04 +09:00

nommu.c

Merge branch 'akpm' (patches from Andrew Morton)

2013-11-13 15:45:43 +09:00

oom_kill.c

mm: convert mm->nr_ptes to atomic_long_t

2013-11-15 09:32:14 +09:00

page_alloc.c

mm/page_alloc.c: fix comment in zlc_setup()

2013-11-13 12:09:11 +09:00

page_cgroup.c

…

page_io.c

aio: Kill aio_rw_vect_retry()

2013-07-30 11:53:12 -04:00

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

mm/pagewalk.c: fix walk_page_range() access of wrong PTEs

2013-10-30 14:27:03 -07:00

percpu-km.c

…

percpu-vm.c

…

percpu.c

percpu: fix bootmem error handling in pcpu_page_first_chunk()

2013-09-23 10:51:45 -04:00

pgtable-generic.c

mm: convert the rest to new page table lock api

2013-11-15 09:32:15 +09:00

process_vm_access.c

…

quicklist.c

…

readahead.c

readahead: fix sequential read cache miss detection

2013-11-13 12:09:09 +09:00

rmap.c

mm, hugetlb: convert hugetlbfs to use split pmd lock

2013-11-15 09:32:14 +09:00

shmem.c

initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled

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

slab_common.c

memcg, kmem: rename cache_from_memcg to cache_from_memcg_idx

2013-11-13 12:09:10 +09:00

slab.c

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

2013-11-22 08:10:34 -08:00

slab.h

memcg, kmem: rename cache_from_memcg to cache_from_memcg_idx

2013-11-13 12:09:10 +09:00

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-11-22 08:10:34 -08:00

sparse-vmemmap.c

…

sparse.c

mm/sparsemem: fix a bug in free_map_bootmem when CONFIG_SPARSEMEM_VMEMMAP

2013-11-13 12:09:06 +09: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: hugetlbfs: fix hugetlbfs optimization

2013-11-21 16:42:27 -08:00

swapfile.c

frontswap: enable call to invalidate area on swapoff

2013-11-13 12:09:07 +09:00

truncate.c

truncate: drop 'oldsize' truncate_pagecache() parameter

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

util.c

mm: factor commit limit calculation

2013-11-13 12:09:11 +09:00

vmalloc.c

mm: kmemleak: avoid false negatives on vmalloc'ed objects

2013-11-13 12:09:07 +09:00

vmpressure.c

memcg: make cgroup_event deal with mem_cgroup instead of cgroup_subsys_state

2013-11-22 18:20:43 -05: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: numa: return the number of base pages altered by protection changes

2013-11-13 12:09:11 +09:00

zbud.c

mm/zbud: fix some trivial typos in comments

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

zswap.c

mm/zswap: refactor the get/put routines

2013-11-13 12:09:11 +09:00