]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9672462 75988f9)
cgroup: Merge branch 'for-4.3-fixes' into for-4.4
authorTejun Heo <tj@kernel.org>
Thu, 24 Sep 2015 20:59:19 +0000 (16:59 -0400)
committerTejun Heo <tj@kernel.org>
Thu, 24 Sep 2015 20:59:19 +0000 (16:59 -0400)
commitfd844953d85e0df71f555935e4762e79e45a7c74
tree2588f61e502038b87e13113fadd01cf2f0b4320atree | snapshot
parent9672462aef61cbdb10ec2427e35b765f73d86d97commit | diff
parent75988f96e0bae1f9a6486f170afc499c91a38ae7commit | diff
cgroup: Merge branch 'for-4.3-fixes' into for-4.4

Pull to receive 75988f96e0ba ("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 7249c82069e0 ("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>
include/linux/backing-dev.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.