]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7fa33aa 94a4acf)
cgroup: Merge branch 'for-6.17-fixes' into for-6.18
authorTejun Heo <tj@kernel.org>
Fri, 5 Sep 2025 17:08:26 +0000 (07:08 -1000)
committerTejun Heo <tj@kernel.org>
Fri, 5 Sep 2025 17:08:26 +0000 (07:08 -1000)
commit4a3e62dfa7b79dc8f759219fe64318ff08e98013
tree1517d477b0a6f12b2d955b514967da96d7a45531tree | snapshot
parent7fa33aa3b001758352c8d0abb9f212a5bb9ed46acommit | diff
parent94a4acfec14615e971eb2c9e1fa6c992c85ff6c6commit | 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>
Documentation/admin-guide/cgroup-v2.rst diff1 | diff2 | blob | history
kernel/cgroup/cgroup.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository