diff options
| author | Tejun Heo <tj@kernel.org> | 2013-11-22 18:32:25 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-11-22 18:32:25 -0500 |
| commit | edab95103d3a1eb5e3faf977eae4ad0b5bf5669c (patch) | |
| tree | 812c111f94b0ae31bf88b49e7c37a7f5ba353eef /init/Kconfig | |
| parent | e5fca243abae1445afbfceebda5f08462ef869d3 (diff) | |
| parent | b36824c75c7855585d6476eef2b234f6e0e68872 (diff) | |
| download | linux-edab95103d3a1eb5e3faf977eae4ad0b5bf5669c.tar.gz | |
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>
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 79383d3aa5dc..93f344337172 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -848,7 +848,6 @@ config NUMA_BALANCING menuconfig CGROUPS boolean "Control Group support" - depends on EVENTFD help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory @@ -915,6 +914,7 @@ config MEMCG bool "Memory Resource Controller for Control Groups" depends on RESOURCE_COUNTERS select MM_OWNER + select EVENTFD help Provides a memory resource controller that manages both anonymous memory and page cache. (See Documentation/cgroups/memory.txt) @@ -1154,7 +1154,6 @@ config UIDGID_STRICT_TYPE_CHECKS config SCHED_AUTOGROUP bool "Automatic process group scheduling" - select EVENTFD select CGROUPS select CGROUP_SCHED select FAIR_GROUP_SCHED |