diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:18:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:18:25 -0800 |
| commit | 03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8 (patch) | |
| tree | 717587b719a5314bcfb5bf4801a022924556515f /include/linux/fpga/fpga-mgr.h | |
| parent | 16d06120d73acde39ac0d5e3c539b4f407e9e588 (diff) | |
| parent | 9ea37e24d4a95dd934a0600d65caa25e409705bb (diff) | |
Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions