| commit | c0522908d22e0b8669e01a7706720996c773e7f4 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Thu Sep 24 16:59:19 2015 -0400 |
| committer | Tejun Heo <tj@kernel.org> | Thu Sep 24 16:59:19 2015 -0400 |
| tree | 2588f61e502038b87e13113fadd01cf2f0b4320a | |
| parent | 10265075aa3a8629b0ccdcff4d10b17bd740defe [diff] | |
| parent | 9badce000e2ce68ba74838a3cd356dde58221c2f [diff] |
cgroup: Merge branch 'for-4.3-fixes' into for-4.4
Pull to receive 9badce000e2c ("cgroup, writeback: don't enable cgroup
writeback on traditional hierarchies"). The commit adds
cgroup_on_dfl() usages in include/linux/backing-dev.h thus causing a
silent conflict with 9e10a130d9b6 ("cgroup: replace cgroup_on_dfl()
tests in controllers with cgroup_subsys_on_dfl()"). The conflict is
fixed during this merge.
Signed-off-by: Tejun Heo <tj@kernel.org>