diff options
author | Tejun Heo <tj@kernel.org> | 2017-02-02 13:50:35 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2017-02-02 13:50:35 -0500 |
commit | 63f1ca59453aadae81f702840c7ac6ea8b9f9262 (patch) | |
tree | 5dc559d4dc33c8e1408f757d8853b23033ea118f /kernel/cgroup/Makefile | |
parent | 576dd464505fc53d501bb94569db76f220104d28 (diff) | |
parent | 7896dfb0a6180beb51bf34b32c9427984cb052c4 (diff) | |
download | linux-63f1ca59453aadae81f702840c7ac6ea8b9f9262.tar.gz linux-63f1ca59453aadae81f702840c7ac6ea8b9f9262.tar.xz |
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>
Diffstat (limited to 'kernel/cgroup/Makefile')
-rw-r--r-- | kernel/cgroup/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile index 6d42a3211164..387348a40c64 100644 --- a/kernel/cgroup/Makefile +++ b/kernel/cgroup/Makefile @@ -2,4 +2,5 @@ obj-y := cgroup.o namespace.o cgroup-v1.o obj-$(CONFIG_CGROUP_FREEZER) += freezer.o obj-$(CONFIG_CGROUP_PIDS) += pids.o +obj-$(CONFIG_CGROUP_RDMA) += rdma.o obj-$(CONFIG_CPUSETS) += cpuset.o |