Merge remote-tracking branch 'cgroup/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)
diff --cc Documentation/admin-guide/cgroup-v2.rst
Simple merge
diff --cc kernel/cgroup/cgroup-internal.h
Simple merge
diff --cc kernel/cgroup/cgroup.c
Simple merge
diff --cc kernel/cgroup/cpuset.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 05:58:58 +0000 (16:58 +1100)
		1	2
Documentation/admin-guide/cgroup-v2.rst	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup/cgroup-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup/cpuset.c	patch \|	diff1 \|	diff2 \|	blob \| history