From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:59:24 +0000 (-0800)
Subject: Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Tag: accepted/tizen/common/20141203.182822~5563
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'for-3.3' of git://git./linux/kernel/git/tj/cgroup

* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)
  cgroup: fix to allow mounting a hierarchy by name
  cgroup: move assignement out of condition in cgroup_attach_proc()
  cgroup: Remove task_lock() from cgroup_post_fork()
  cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()
  cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static
  cgroup: only need to check oldcgrp==newgrp once
  cgroup: remove redundant get/put of task struct
  cgroup: remove redundant get/put of old css_set from migrate
  cgroup: Remove unnecessary task_lock before fetching css_set on migration
  cgroup: Drop task_lock(parent) on cgroup_fork()
  cgroups: remove redundant get/put of css_set from css_set_check_fetched()
  resource cgroups: remove bogus cast
  cgroup: kill subsys->can_attach_task(), pre_attach() and attach_task()
  cgroup, cpuset: don't use ss->pre_attach()
  cgroup: don't use subsys->can_attach_task() or ->attach_task()
  cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach()
  cgroup: improve old cgroup handling in cgroup_attach_proc()
  cgroup: always lock threadgroup during migration
  threadgroup: extend threadgroup_lock() to cover exit and exec
  threadgroup: rename signal->threadgroup_fork_lock to ->group_rwsem
  ...

Fix up conflict in kernel/cgroup.c due to commit e0197aae59e5: "cgroups:
fix a css_set not found bug in cgroup_attach_proc" that already
mentioned that the bug is fixed (differently) in Tejun's cgroup
patchset. This one, in other words.
---

db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3
diff --cc kernel/cgroup.c
index 7cab65f,39c7caef..a5d3b53
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -1038,12 -1056,12 +1056,12 @@@ static int rebind_subsystems(struct cgr
  	return 0;
  }
  
 -static int cgroup_show_options(struct seq_file *seq, struct vfsmount *vfs)
 +static int cgroup_show_options(struct seq_file *seq, struct dentry *dentry)
  {
 -	struct cgroupfs_root *root = vfs->mnt_sb->s_fs_info;
 +	struct cgroupfs_root *root = dentry->d_sb->s_fs_info;
  	struct cgroup_subsys *ss;
  
- 	mutex_lock(&cgroup_mutex);
+ 	mutex_lock(&cgroup_root_mutex);
  	for_each_subsys(root, ss)
  		seq_printf(seq, ",%s", ss->name);
  	if (test_bit(ROOT_NOPREFIX, &root->flags))