diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-28 11:16:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-28 11:16:38 -0800 |
commit | 91afe604c15405a7b15d1464f224372cd82d3e2c (patch) | |
tree | 084162233a05f1f5ef92f160f6a0b037f58bab9f /tools | |
parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
parent | 2d18e54dd8662442ef5898c6bdadeaf90b3cebbc (diff) | |
download | linux-91afe604c15405a7b15d1464f224372cd82d3e2c.tar.bz2 |
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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions