]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7cef06 0ab02ca)
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
authorTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000 (11:02 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000 (11:02 -0500)
Pull for-3.14-fixes to receive 0ab02ca8f887 ("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>
1  2 
include/linux/cgroup.h patch | diff1 | diff2 | blob | history
kernel/cgroup.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/cgroup.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.