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

Pull cgroup updates from Tejun Heo:
 "Cgroup2 cpu controller support is finally merged.

   - Basic cpu statistics support to allow monitoring by default without
     the CPU controller enabled.

   - cgroup2 cpu controller support.

   - /sys/kernel/cgroup files to help dealing with new / optional
     features"

* 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: export list of cgroups v2 features using sysfs
  cgroup: export list of delegatable control files using sysfs
  cgroup: mark @cgrp __maybe_unused in cpu_stat_show()
  MAINTAINERS: relocate cpuset.c
  cgroup, sched: Move basic cpu stats from cgroup.stat to cpu.stat
  sched: Implement interface for cgroup unified hierarchy
  sched: Misc preps for cgroup unified hierarchy interface
  sched/cputime: Add dummy cputime_adjust() implementation for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
  cgroup: statically initialize init_css_set->dfl_cgrp
  cgroup: Implement cgroup2 basic CPU usage accounting
  cpuacct: Introduce cgroup_account_cputime[_field]()
  sched/cputime: Expose cputime_adjust()

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc kernel/cgroup/Makefile
index ae448f7632cc64753e0e0e4d9c4a0e65d41912a5,0acee616e06cb304053b54831741128a92f28924..2be89a003185bb4cb3613a539496008c129643d9
--- 1/kernel/cgroup/Makefile
--- 2/kernel/cgroup/Makefile
+++ b/kernel/cgroup/Makefile
@@@ -1,5 -1,4 +1,5 @@@
- obj-y := cgroup.o namespace.o cgroup-v1.o
 +# SPDX-License-Identifier: GPL-2.0
+ obj-y := cgroup.o stat.o namespace.o cgroup-v1.o
  
  obj-$(CONFIG_CGROUP_FREEZER) += freezer.o
  obj-$(CONFIG_CGROUP_PIDS) += pids.o

diff --cc kernel/cgroup/cgroup-internal.h
Simple merge

diff --cc kernel/cgroup/cgroup.c
index 00f5b358aeac5af94424c22b0e6a006874b10ce0,69e65d28fe98ed9f8fa057010ba809cf5d811294..0b1ffe147f240c39726d79505c4e02e8fe40cd47
--- 1/kernel/cgroup/cgroup.c
--- 2/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@@ -4765,8 -4833,9 +4844,11 @@@ static struct cgroup *cgroup_create(str
  
        return cgrp;
  
 +out_idr_free:
 +      cgroup_idr_remove(&root->cgroup_idr, cgrp->id);
+ out_stat_exit:
+       if (cgroup_on_dfl(parent))
+               cgroup_stat_exit(cgrp);
  out_cancel_ref:
        percpu_ref_exit(&cgrp->self.refcnt);
  out_free_cgrp:

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

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

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

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

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

diff --cc kernel/sched/sched.h
Simple merge

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