summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 17:15:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 17:15:46 -0700
commit83c4087ce468601501ecde4d0ec5b2abd5f57c31 (patch)
tree238d60de7b4f5b4b70fe851c76f04e5a5f5efaa4 /Documentation
parenta67eefad996f007afc7c38efe8f45257fb1e3994 (diff)
parenta90e90b7d55e789c71d85b946ffb5c1ab2f137ca (diff)
downloadlinux-83c4087ce468601501ecde4d0ec5b2abd5f57c31.tar.bz2
Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: "All trivial changes - simplification, typo fix and adding cond_resched() in a netclassid update loop" * 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup, netclassid: add a preemption point to write_classid rdmacg: fix a typo in rdmacg documentation cgroup: Simplify cgroup_ancestor
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroup-v1/rdma.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cgroup-v1/rdma.txt b/Documentation/cgroup-v1/rdma.txt
index af618171e0eb..9bdb7fd03f83 100644
--- a/Documentation/cgroup-v1/rdma.txt
+++ b/Documentation/cgroup-v1/rdma.txt
@@ -27,7 +27,7 @@ cgroup.
Currently user space applications can easily take away all the rdma verb
specific resources such as AH, CQ, QP, MR etc. Due to which other applications
in other cgroup or kernel space ULPs may not even get chance to allocate any
-rdma resources. This can leads to service unavailability.
+rdma resources. This can lead to service unavailability.
Therefore RDMA controller is needed through which resource consumption
of processes can be limited. Through this controller different rdma