diff options
| author |   Tejun Heo <tj@kernel.org> | 2025-09-05 07:08:26 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-09-05 07:08:26 -1000 |
| commit | 4a3e62dfa7b79dc8f759219fe64318ff08e98013 (patch) | |
| tree | 1517d477b0a6f12b2d955b514967da96d7a45531 /scripts/basic/git:/ssh:/git@git.zx2c4.com | |
| parent | cgroup: WQ_PERCPU added to alloc_workqueue users (diff) | |
| parent | cgroup/psi: Set of->priv to NULL upon file release (diff) | |
cgroup: Merge branch 'for-6.17-fixes' into for-6.18
Pull for-6.17-fixes to receive 79f919a89c9d ("cgroup: split
cgroup_destroy_wq into 3 workqueues") to resolve its conflict with
7fa33aa3b001 ("cgroup: WQ_PERCPU added to alloc_workqueue users"). The
latter adds WQ_PERCPU when creating cgroup_destroy_wq and the former splits
the workqueue into three. Resolve by applying WQ_PERCPU to the three split
workqueues.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'scripts/basic/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions