From: Tejun Heo <tj@kernel.org>
Date: Fri, 22 Nov 2013 23:32:25 +0000 (-0500)
Subject: cgroup: Merge branch 'memcg_event' into for-3.14
X-Git-Tag: v3.14-rc1~136^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edab95103d3a1eb5e3faf977eae4ad0b5bf5669c;p=pandora-kernel.git

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>
---

edab95103d3a1eb5e3faf977eae4ad0b5bf5669c
Reading git-diff-tree failed