projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1026507 9badce0)
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)
commitc0522908d22e0b8669e01a7706720996c773e7f4
tree2588f61e502038b87e13113fadd01cf2f0b4320atree | snapshot (tar.gz zip)
parent10265075aa3a8629b0ccdcff4d10b17bd740defecommit | diff
parent9badce000e2ce68ba74838a3cd356dde58221c2fcommit | 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>
include/linux/backing-dev.h diff1 | diff2 | blob | history