diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-11 17:10:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-11 17:10:05 -0800 |
| commit | 085bec853afdbf3edf1b554defaac606a7e3f0c2 (patch) | |
| tree | 130711ffc0da2b519b564bbb7bd3aebdaed3a6e8 /mm | |
| parent | 72dd379e67fb6c4f4b0ed8ee36e9fed78227f352 (diff) | |
| parent | c2f31b79d510ec1a27138bdcf2d0ece1080be85e (diff) | |
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
- Prateek posted a couple patches to fix a deadlock involving cpuset
and workqueue. It unfortunately caused a different deadlock and the
recent workqueue hotplug simplification removed the original
deadlock, so Prateek's two patches are reverted for now.
- The new stat code was missing u64_stats initialization. Fixed.
- Doc and other misc changes
* 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: add warning about RT not being supported on cgroup2
Revert "cgroup/cpuset: remove circular dependency deadlock"
Revert "cpuset: Make cpuset hotplug synchronous"
cgroup: properly init u64_stats
debug cgroup: use task_css_set instead of rcu_dereference
cpuset: Make cpuset hotplug synchronous
cgroup/cpuset: remove circular dependency deadlock
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions