From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Oct 2018 00:15:46 +0000 (-0700)
Subject: Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=83c4087ce468601501ecde4d0ec5b2abd5f57c31;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-4.20' of git://git./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
---

83c4087ce468601501ecde4d0ec5b2abd5f57c31