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-v1.c

…

cgroup.c

cgroup: drop the matching uid requirement on migration for cgroup v2

2017-02-02 13:47:56 -05:00

cpuset.c

…

freezer.c

…

Makefile

…

namespace.c

…

pids.c

…

rdma.c

…