| commit | a9986464564609dd0962e6023513f7d3d313dc80 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 13 Nov 2013 06:21:53 +0000 (13 15:21 +0900) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 13 Nov 2013 06:21:53 +0000 (13 15:21 +0900) | ||
| tree | bcec3cd7404bdf3ac2e205a8cce5810b90ece6bf | treesnapshot (tar.gz zip) |
| parent | 13aa7e0bc20f7f7e5ef45f0defc4ff4380802302 | commitdiff |
| parent | 73ba353471e0b692f398f3d63018b7f46ccf1d3e | commitdiff |
Merge branch 'for-3.13' of git://git./linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo:
"Not too much activity this time around. css_id is finally killed and
a minor update to device_cgroup"
* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
device_cgroup: remove can_attach
cgroup: kill css_id
memcg: stop using css id
memcg: fail to create cgroup if the cgroup id is too big
memcg: convert to use cgroup id
memcg: convert to use cgroup_is_descendant()
Pull cgroup changes from Tejun Heo:
"Not too much activity this time around. css_id is finally killed and
a minor update to device_cgroup"
* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
device_cgroup: remove can_attach
cgroup: kill css_id
memcg: stop using css id
memcg: fail to create cgroup if the cgroup id is too big
memcg: convert to use cgroup id
memcg: convert to use cgroup_is_descendant()
| kernel/cgroup.c | diff1 | diff2 | blobhistory |
| mm/memcontrol.c | diff1 | diff2 | blobhistory |