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: NTejun Heo <tj@kernel.org>
Showing
Documentation/cgroup-v1/rdma.txt
0 → 100644
drivers/infiniband/core/cgroup.c
0 → 100644
include/linux/cgroup_rdma.h
0 → 100644
kernel/cgroup/rdma.c
0 → 100644
想要评论请 注册 或 登录