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

diff --cc Documentation/admin-guide/cgroup-v1/memory.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc kernel/cgroup/cgroup.c
index 5fa95f86cb4dd3d836e0292c6cb5dc6ad6777216,c7aafb59ecf240d916af205b51aac586dab494cc..c2c97529235aa4989b28de2e38bed70e8ff78ade
--- 1/kernel/cgroup/cgroup.c
--- 2/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@@ -3654,9 -3632,32 +3654,10 @@@ static int cgroup_stat_show(struct seq_
        return 0;
  }
  
- static int __maybe_unused cgroup_extra_stat_show(struct seq_file *seq,
-                                                struct cgroup *cgrp, int ssid)
+ #ifdef CONFIG_CGROUP_SCHED
 -/**
 - * cgroup_tryget_css - try to get a cgroup's css for the specified subsystem
 - * @cgrp: the cgroup of interest
 - * @ss: the subsystem of interest
 - *
 - * Find and get @cgrp's css associated with @ss.  If the css doesn't exist
 - * or is offline, %NULL is returned.
 - */
 -static struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp,
 -                                                   struct cgroup_subsys *ss)
 -{
 -      struct cgroup_subsys_state *css;
 -
 -      rcu_read_lock();
 -      css = cgroup_css(cgrp, ss);
 -      if (css && !css_tryget_online(css))
 -              css = NULL;
 -      rcu_read_unlock();
 -
 -      return css;
 -}
 -
+ static int cgroup_extra_stat_show(struct seq_file *seq, int ssid)
  {
+       struct cgroup *cgrp = seq_css(seq)->cgroup;
        struct cgroup_subsys *ss = cgroup_subsys[ssid];
        struct cgroup_subsys_state *css;
        int ret;

diff --cc tools/testing/selftests/cgroup/.gitignore
index 4d556df4f77b6279ce7cc7fc7e1d0ea251a807a7,8443a8d46a1c659b06835c228fb525bc3ff4a190..af8c3f30b9c1cbc9bcd3029cea9406a5f6220275
--- 1/tools/testing/selftests/cgroup/.gitignore
--- 2/tools/testing/selftests/cgroup/.gitignore
+++ b/tools/testing/selftests/cgroup/.gitignore
@@@ -5,5 -5,5 +5,6 @@@ test_freeze
  test_kmem
  test_kill
  test_cpu
+ test_cpuset
 +test_zswap
  wait_inotify

diff --cc tools/testing/selftests/cgroup/Makefile
index 27dbdd7bb4bb693912d7404acfd51a274efb6b24,dee0f013c7f40eda756947a6400141eda00aac3d..c27f05f6ce9b87504d3a9c3b16d9cdf9a23e14d7
--- 1/tools/testing/selftests/cgroup/Makefile
--- 2/tools/testing/selftests/cgroup/Makefile
+++ b/tools/testing/selftests/cgroup/Makefile
@@@ -12,7 -12,7 +12,8 @@@ TEST_GEN_PROGS += test_cor
  TEST_GEN_PROGS += test_freezer
  TEST_GEN_PROGS += test_kill
  TEST_GEN_PROGS += test_cpu
+ TEST_GEN_PROGS += test_cpuset
 +TEST_GEN_PROGS += test_zswap
  
  LOCAL_HDRS += $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidfd.h
  
@@@ -24,4 -24,4 +25,5 @@@ $(OUTPUT)/test_core: cgroup_util.
  $(OUTPUT)/test_freezer: cgroup_util.c
  $(OUTPUT)/test_kill: cgroup_util.c
  $(OUTPUT)/test_cpu: cgroup_util.c
+ $(OUTPUT)/test_cpuset: cgroup_util.c
 +$(OUTPUT)/test_zswap: cgroup_util.c