From: Linus Torvalds Date: Mon, 24 May 2021 17:46:31 +0000 (-1000) Subject: Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... X-Git-Tag: v5.13-rc4~35 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1434a3127887a7e708be5f4edd5e36d64d8622f8;p=users%2Fdwmw2%2Flinux.git Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup Pull cgroup fixes from Tejun Heo: - "cgroup_disable=" boot param was being applied too late confusing some subsystems. Fix it by moving application to __setup() time. - Comment spelling fixes. Included here to lower the chance of trivial future merge conflicts. * 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: fix spelling mistakes cgroup: disable controllers at parse time --- 1434a3127887a7e708be5f4edd5e36d64d8622f8