edab95103d
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>
|
||
|---|---|---|
| .. | ||
| 00-INDEX | ||
| blkio-controller.txt | ||
| cgroups.txt | ||
| cpuacct.txt | ||
| cpusets.txt | ||
| devices.txt | ||
| freezer-subsystem.txt | ||
| hugetlb.txt | ||
| memcg_test.txt | ||
| memory.txt | ||
| net_cls.txt | ||
| net_prio.txt | ||
| resource_counter.txt | ||