diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-25 09:56:49 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-25 09:56:49 -0500 |
| commit | f153ad11bca27996a5e8e1782557e36e80b03a8c (patch) | |
| tree | df87bf56d2c7fb6d7b3122ed838ce652337b08a3 /include/linux/cgroup.h | |
| parent | dc5736ed7aaf942caaac0c15af74a018e04ec79d (diff) | |
| parent | 532de3fc72adc2a6525c4d53c07bf81e1732083d (diff) | |
| download | linux-f153ad11bca27996a5e8e1782557e36e80b03a8c.tar.gz linux-f153ad11bca27996a5e8e1782557e36e80b03a8c.tar.bz2 linux-f153ad11bca27996a5e8e1782557e36e80b03a8c.zip | |
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
Pull in for-3.14-fixes to receive 532de3fc72ad ("cgroup: update
cgroup_enable_task_cg_lists() to grab siglock") which conflicts with
afeb0f9fd425 ("cgroup: relocate cgroup_enable_task_cg_lists()") and
the following cg_lists updates. This is likely to cause further
conflicts down the line too, so let's merge it early.
As cgroup_enable_task_cg_lists() is relocated in for-3.15, this merge
causes conflict in the original position. It's resolved by applying
siglock changes to the updated version in the new location.
Conflicts:
kernel/cgroup.c
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/cgroup.h')
0 files changed, 0 insertions, 0 deletions