Merge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2015 23:20:55 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2015 23:20:55 +0000 (16:20 -0700)
commitd4a748a10e50d95992ae67677f1a1a13e2d6ed47
tree74bd3b0543be9c1506f9774f188ea36a4105154d
parent03e8f644868f147e021e8660346890e731c2e435
parent9badce000e2ce68ba74838a3cd356dde58221c2f
Merge branch 'for-4.3-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull another cgroup fix from Tejun Heo:
 "The cgroup writeback support got inadvertently enabled for traditional
  hierarchies revealing two regressions which are currently being worked
  on.  It shouldn't have been enabled on traditional hierarchies, so
  disable it on them.  This is enough to make the regressions go away
  for people who aren't experimenting with cgroup"

* 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup, writeback: don't enable cgroup writeback on traditional hierarchies