Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
authorTejun Heo <tj@kernel.org>
Tue, 25 Feb 2014 14:56:49 +0000 (09:56 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 25 Feb 2014 14:56:49 +0000 (09:56 -0500)
commitf153ad11bca27996a5e8e1782557e36e80b03a8c
treedf87bf56d2c7fb6d7b3122ed838ce652337b08a3
parentdc5736ed7aaf942caaac0c15af74a018e04ec79d
parent532de3fc72adc2a6525c4d53c07bf81e1732083d
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>
kernel/cgroup.c