Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git

diff --cc block/blk-cgroup.c
Simple merge

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

diff --cc kernel/cgroup/cpuset.c
Simple merge

diff --cc mm/memcontrol.c
index 9ea6e5591cabb0cee367f77e616ca6acaa50a6aa,fde0934e2837c7c182a2ce55019163dfb5ca05bf..a713f160d6697cf5bad820171947a2d85ad3a740
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -596,17 -582,9 +596,17 @@@ static inline void memcg_rstat_updated(
        if (!val)
                return;
  
-       cgroup_rstat_updated(memcg->css.cgroup, cpu);
+       css_rstat_updated(&memcg->css, cpu);
        statc = this_cpu_ptr(memcg->vmstats_percpu);
        for (; statc; statc = statc->parent) {
 +              /*
 +               * If @memcg is already flushable then all its ancestors are
 +               * flushable as well and also there is no need to increase
 +               * stats_updates.
 +               */
 +              if (memcg_vmstats_needs_flush(statc->vmstats))
 +                      break;
 +
                stats_updates = READ_ONCE(statc->stats_updates) + abs(val);
                WRITE_ONCE(statc->stats_updates, stats_updates);
                if (stats_updates < MEMCG_CHARGE_BATCH)