Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2021 17:46:31 +0000 (07:46 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2021 17:46:31 +0000 (07:46 -1000)
commit1434a3127887a7e708be5f4edd5e36d64d8622f8
treee6f47e97e6cbd176db98d66d2cf19804da71aba6
parent5df7ae7bed412aa3f2e26ee8271abb24885ee557
parent08b2b6fdf6b26032f025084ce2893924a0cdb4a2
Merge branch 'for-5.13-fixes' of git://git./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