Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:03:01 +0000 (15:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:03:04 +0000 (15:03 +1100)
12 files changed:
1  2 
Documentation/cgroups/unified-hierarchy.txt
block/blk-cgroup.c
include/linux/backing-dev.h
include/linux/init_task.h
include/linux/jump_label.h
include/linux/memcontrol.h
include/linux/sched.h
kernel/events/core.c
kernel/fork.c
kernel/sched/core.c
mm/memcontrol.c
mm/vmscan.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc mm/vmscan.c
@@@ -175,7 -175,7 +175,7 @@@ static bool sane_reclaim(struct scan_co
        if (!memcg)
                return true;
  #ifdef CONFIG_CGROUP_WRITEBACK
-       if (cgroup_on_dfl(memcg->css.cgroup))
 -      if (memcg->css.cgroup)
++      if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
                return true;
  #endif
        return false;