Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.16

Browse source

Pull to receive e37a06f109 ("cgroup: fix the retry path of
cgroup_mount()") to avoid unnecessary conflicts with planned
cgroup_tree_mutex removal and also to be able to remove the temp fix
added by 36c38fb714 ("blkcg: use trylock on blkcg_pol_mutex in
blkcg_reset_stats()") afterwards.

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

...

This commit is contained in:

Tejun Heo 2014-05-13 11:30:04 -04:00

parent d39ea871c3 36e9d2ebcc

commit f21a4f7594

5 changed files with 238 additions and 112 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

15

block/blk-cgroup.c

View file

15

include/linux/cgroup.h

View file

2

kernel/cgroup.c

View file

116

kernel/cgroup_freezer.c

View file

210

security/device_cgroup.c

View file