-
Tejun Heo authored
Pull in for-3.14-fixes to receive 532de3fc ("cgroup: update cgroup_enable_task_cg_lists() to grab siglock") which conflicts with afeb0f9f ("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>
f153ad11