Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15

Browse source

Pull for-3.14-fixes to receive 0ab02ca8f8 ("cgroup: protect
modifications to cgroup_idr with cgroup_mutex") prior to kernfs
conversion series to avoid non-trivial conflicts.

Signed-off-by: Tejun Heo <tj@kernel.org>

...

This commit is contained in:

Tejun Heo 2014-02-11 11:02:59 -05:00

parent f7cef064aa 0ab02ca8f8

commit 398f878789

2 changed files with 20 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/cgroup.h

View file

34

kernel/cgroup.c

View file