From: Tejun Heo <tj@kernel.org>
Date: Tue, 25 Feb 2014 14:56:49 +0000 (-0500)
Subject: Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
X-Git-Tag: v3.15-rc1~109^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f153ad11bca27996a5e8e1782557e36e80b03a8c;p=pandora-kernel.git

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>
---

f153ad11bca27996a5e8e1782557e36e80b03a8c
Reading git-diff-tree failed