tree 812c111f94b0ae31bf88b49e7c37a7f5ba353eef
parent e5fca243abae1445afbfceebda5f08462ef869d3
parent b36824c75c7855585d6476eef2b234f6e0e68872
author Tejun Heo <tj@kernel.org> 1385163145 -0500
committer Tejun Heo <tj@kernel.org> 1385163145 -0500

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>