diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 23:29:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 23:29:44 +0100 |
| commit | 22714a2ba4b55737cd7d5299db7aaf1fa8287354 (patch) | |
| tree | 32b25f2e3e40732156a8a8d0dcb2ddf38410776f /kernel/pid_namespace.c | |
| parent | Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/p... (diff) | |
| parent | cgroup: export list of cgroups v2 features using sysfs (diff) | |
| download | linux-22714a2ba4b55737cd7d5299db7aaf1fa8287354.tar.xz linux-22714a2ba4b55737cd7d5299db7aaf1fa8287354.zip | |
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Cgroup2 cpu controller support is finally merged.
- Basic cpu statistics support to allow monitoring by default without
the CPU controller enabled.
- cgroup2 cpu controller support.
- /sys/kernel/cgroup files to help dealing with new / optional
features"
* 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: export list of cgroups v2 features using sysfs
cgroup: export list of delegatable control files using sysfs
cgroup: mark @cgrp __maybe_unused in cpu_stat_show()
MAINTAINERS: relocate cpuset.c
cgroup, sched: Move basic cpu stats from cgroup.stat to cpu.stat
sched: Implement interface for cgroup unified hierarchy
sched: Misc preps for cgroup unified hierarchy interface
sched/cputime: Add dummy cputime_adjust() implementation for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
cgroup: statically initialize init_css_set->dfl_cgrp
cgroup: Implement cgroup2 basic CPU usage accounting
cpuacct: Introduce cgroup_account_cputime[_field]()
sched/cputime: Expose cputime_adjust()
Diffstat (limited to 'kernel/pid_namespace.c')
0 files changed, 0 insertions, 0 deletions