diff options
| author | Tejun Heo <tj@kernel.org> | 2013-05-24 03:53:09 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-05-24 03:53:09 +0200 |
| commit | 3f33e64f4a212771a0b5c63eddaa7f81e65223e3 (patch) | |
| tree | a212de935bb984849a5bf3bed3618dc9975203db /include | |
| parent | cgroup.h: remove some functions that are now gone (diff) | |
| parent | cgroup: fix a subtle bug in descendant pre-order walk (diff) | |
| download | linux-3f33e64f4a212771a0b5c63eddaa7f81e65223e3.tar.xz linux-3f33e64f4a212771a0b5c63eddaa7f81e65223e3.zip | |
Merge branch 'for-3.10-fixes' into for-3.11
Merging to receive 7805d000db ("cgroup: fix a subtle bug in descendant
pre-order walk") so that further iterator updates can build upon it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 4f6f5138c340..1df5f699be61 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -709,7 +709,7 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos); * * If a subsystem synchronizes against the parent in its ->css_online() and * before starting iterating, and synchronizes against @pos on each - * iteration, any descendant cgroup which finished ->css_offline() is + * iteration, any descendant cgroup which finished ->css_online() is * guaranteed to be visible in the future iterations. * * In other words, the following guarantees that a descendant can't escape |