diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 09:18:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 09:18:31 -0800 |
| commit | 9ae46e6702d98d22037368896298d05958ad5737 (patch) | |
| tree | 019ce8ccff0a88fc7f5ebaf5c052daac5bac3860 /MAINTAINERS | |
| parent | 502b24c23b44fbaa01cc2cbd86d8035845b7811f (diff) | |
| parent | d127027baf98dce3ca31bec18c2c0e048ceda7c4 (diff) | |
| download | linux-3.10-9ae46e6702d98d22037368896298d05958ad5737.tar.gz linux-3.10-9ae46e6702d98d22037368896298d05958ad5737.tar.bz2 linux-3.10-9ae46e6702d98d22037368896298d05958ad5737.zip | |
Merge branch 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cpuset changes from Tejun Heo:
- Synchornization has seen a lot of changes with focus on decoupling
cpuset synchronization from cgroup internal locking.
After this change, there only remain a couple of mostly trivial
dependencies on cgroup_lock outside cgroup core proper. cgroup_lock
is scheduled to be unexported in this devel cycle.
This will finally remove the fragile locking order around cgroup
(cgroup locking wants to / should be one of the outermost but yet has
been acquired from deep inside individual controllers).
- At this point, Li is most knowlegeable with cpuset and taking over
the maintainership of cpuset.
* 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: drop spurious retval assignment in proc_cpuset_show()
cpuset: fix RCU lockdep splat
cpuset: update MAINTAINERS
cpuset: remove cpuset->parent
cpuset: replace cpuset->stack_list with cpuset_for_each_descendant_pre()
cpuset: replace cgroup_mutex locking with cpuset internal locking
cpuset: schedule hotplug propagation from cpuset_attach() if the cpuset is empty
cpuset: pin down cpus and mems while a task is being attached
cpuset: make CPU / memory hotplug propagation asynchronous
cpuset: drop async_rebuild_sched_domains()
cpuset: don't nest cgroup_mutex inside get_online_cpus()
cpuset: reorganize CPU / memory hotplug handling
cpuset: cleanup cpuset[_can]_attach()
cpuset: introduce cpuset_for_each_child()
cpuset: introduce CS_ONLINE
cpuset: introduce ->css_on/offline()
cpuset: remove fast exit path from remove_tasks_in_empty_cpuset()
cpuset: remove unused cpuset_unlock()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 526fb85f2f7..b7013e41b62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2140,10 +2140,10 @@ S: Maintained F: tools/power/cpupower CPUSETS -M: Paul Menage <paul@paulmenage.org> +M: Li Zefan <lizefan@huawei.com> W: http://www.bullopensource.org/cpuset/ W: http://oss.sgi.com/projects/cpusets/ -S: Supported +S: Maintained F: Documentation/cgroups/cpusets.txt F: include/linux/cpuset.h F: kernel/cpuset.c |