Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
	block/blk-cgroup.c

diff --cc block/blk-cgroup.c
index 27886935804966b8246c3495898cdaec1088b9f6,b8c143d68ee02664758df3e6d702c79fd594d8d4..fa8f26309444d2cdda41cae813cf6f5a70f1de06
--- 1/block/blk-cgroup.c
--- 2/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@@ -1641,15 -1648,18 +1648,19 @@@ static int blkiocg_can_attach(struct cg
        return ret;
  }
  
- static void blkiocg_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                          struct cgroup_taskset *tset)
  {
+       struct task_struct *task;
        struct io_context *ioc;
  
-       /* we don't lose anything even if ioc allocation fails */
-       ioc = get_task_io_context(tsk, GFP_ATOMIC, NUMA_NO_NODE);
-       if (ioc) {
-               ioc_cgroup_changed(ioc);
-               put_io_context(ioc, NULL);
+       cgroup_taskset_for_each(task, cgrp, tset) {
 -              task_lock(task);
 -              ioc = task->io_context;
 -              if (ioc)
 -                      ioc->cgroup_changed = 1;
 -              task_unlock(task);
++              /* we don't lose anything even if ioc allocation fails */
++              ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);
++              if (ioc) {
++                      ioc_cgroup_changed(ioc);
++                      put_io_context(ioc, NULL);
++              }
        }
  }
  

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge