Tejun Heo 63f1ca5945 Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11 ... Merge in to resolve conflicts in Documentation/cgroup-v2.txt. The conflicts are from multiple section additions and trivial to resolve. Signed-off-by: Tejun Heo <tj@kernel.org>		2017-02-02 13:50:35 -05:00
..
cgroup-internal.h	cgroup: call subsys->*attach() only for subsystems which are actually affected by migration	2017-01-15 19:03:41 -05:00
cgroup-v1.c	cgroup: call subsys->*attach() only for subsystems which are actually affected by migration	2017-01-15 19:03:41 -05:00
cgroup.c	cgroup: drop the matching uid requirement on migration for cgroup v2	2017-02-02 13:47:56 -05:00
cpuset.c	cgroup: move cgroup files under kernel/cgroup/	2016-12-27 14:49:05 -05:00
freezer.c	cgroup: move cgroup files under kernel/cgroup/	2016-12-27 14:49:05 -05:00
Makefile	rdmacg: Added rdma cgroup controller	2017-01-10 11:14:27 -05:00
namespace.c	cgroup: move namespace code to kernel/cgroup/namespace.c	2016-12-27 14:49:09 -05:00
pids.c	cgroup: move cgroup files under kernel/cgroup/	2016-12-27 14:49:05 -05:00
rdma.c	rdmacg: Fixed uninitialized current resource usage	2017-01-10 12:52:32 -05:00