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 Documentation/admin-guide/cgroup-v2.rst
Simple merge

diff --cc init/Kconfig
Simple merge

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

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

diff --cc mm/memcontrol-v1.c
Simple merge