diff options
| author | Linus Torvalds | 2021-05-24 07:46:31 -1000 |
|---|---|---|
| committer | Linus Torvalds | 2021-05-24 07:46:31 -1000 |
| commit | 1434a3127887a7e708be5f4edd5e36d64d8622f8 (patch) | |
| tree | e6f47e97e6cbd176db98d66d2cf19804da71aba6 /block/blk-pm.c | |
| parent | 5df7ae7bed412aa3f2e26ee8271abb24885ee557 (diff) | |
| parent | 08b2b6fdf6b26032f025084ce2893924a0cdb4a2 (diff) | |
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
Diffstat (limited to 'block/blk-pm.c')
0 files changed, 0 insertions, 0 deletions