]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorTejun Heo <tj@kernel.org>
Tue, 13 May 2014 15:30:04 +0000 (11:30 -0400)
committerTejun Heo <tj@kernel.org>
Tue, 13 May 2014 15:30:04 +0000 (11:30 -0400)
commit567121c56f7ceb3c0df1a5d24410e047c037b3d1
treebdce189dc55f875e5466c31374c52b48f4ba4db0
parentf1adeaf779b04ceb4cf824dc3e452426d62dad25
parenteff323b65ffd5990f4534b3761678dbf530e1aee
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.16

Pull to receive 2ae52bd59efc ("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 722f36b84ebb ("blkcg: use trylock on blkcg_pol_mutex in
blkcg_reset_stats()") afterwards.

Signed-off-by: Tejun Heo <tj@kernel.org>
include/linux/cgroup.h
kernel/cgroup.c