]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6971fbe47ff5fc07062dbd1adda3022ea62873d3
treee6f47e97e6cbd176db98d66d2cf19804da71aba6
parent731fe57543106cf478734c837d2105256f3f1030
parent660ae8efbc90454184794adc6d6418b01ad85eae
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