Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2020 23:18:25 +0000 (15:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2020 23:18:25 +0000 (15:18 -0800)
commit03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8
tree717587b719a5314bcfb5bf4801a022924556515f
parent16d06120d73acde39ac0d5e3c539b4f407e9e588
parent9ea37e24d4a95dd934a0600d65caa25e409705bb
Merge branch 'for-5.6' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:

 - cgroup2 interface for hugetlb controller. I think this was the last
   remaining bit which was missing from cgroup2

 - fixes for race and a spurious warning in threaded cgroup handling

 - other minor changes

* 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  iocost: Fix iocost_monitor.py due to helper type mismatch
  cgroup: Prevent double killing of css when enabling threaded cgroup
  cgroup: fix function name in comment
  mm: hugetlb controller for cgroups v2