mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
d206e09036
Pull cgroup changes from Tejun Heo:
"A lot of activities on cgroup side. The big changes are focused on
making cgroup hierarchy handling saner.
- cgroup_rmdir() had peculiar semantics - it allowed cgroup
destruction to be vetoed by individual controllers and tried to
drain refcnt synchronously. The vetoing never worked properly and
caused good deal of contortions in cgroup. memcg was the last
reamining user. Michal Hocko removed the usage and cgroup_rmdir()
path has been simplified significantly. This was done in a
separate branch so that the memcg people can base further memcg
changes on top.
- The above allowed cleaning up cgroup lifecycle management and
implementation of generic cgroup iterators which are used to
improve hierarchy support.
- cgroup_freezer updated to allow migration in and out of a frozen
cgroup and handle hierarchy. If a cgroup is frozen, all descendant
cgroups are frozen.
- netcls_cgroup and netprio_cgroup updated to handle hierarchy
properly.
- Various fixes and cleanups.
- Two merge commits. One to pull in memcg and rmdir cleanups (needed
to build iterators). The other pulled in cgroup/for-3.7-fixes for
device_cgroup fixes so that further device_cgroup patches can be
stacked on top."
Fixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to
commit
|
||
|---|---|---|
| .. | ||
| 00-INDEX | ||
| blkio-controller.txt | ||
| cgroup_event_listener.c | ||
| cgroups.txt | ||
| cpuacct.txt | ||
| cpusets.txt | ||
| devices.txt | ||
| freezer-subsystem.txt | ||
| hugetlb.txt | ||
| memcg_test.txt | ||
| memory.txt | ||
| net_prio.txt | ||
| resource_counter.txt | ||