From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Dec 2020 19:16:38 +0000 (-0800)
Subject: Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Tag: howlett/maple/20220722_2~4073
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=91afe604c15405a7b15d1464f224372cd82d3e2c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
 "These three patches were scheduled for the merge window but I forgot
  to send them out. Sorry about that.

  None of them are significant and they fit well in a fix pull request
  too - two are cosmetic and one fixes a memory leak in the mount option
  parsing path"

* 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: Fix memory leak when parsing multiple source parameters
  cgroup/cgroup.c: replace 'of->kn->priv' with of_cft()
  kernel: cgroup: Mundane spelling fixes throughout the file
---

91afe604c15405a7b15d1464f224372cd82d3e2c