diff options
| author | Tejun Heo <tj@kernel.org> | 2023-11-22 19:18:49 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2023-11-22 19:18:49 +0300 |
| commit | 202595663905384c4c629afd7b897af63a1563b5 (patch) | |
| tree | 881eaa6c9d30890519a08d523a73f171d1859f54 /kernel/cgroup | |
| parent | 49277a5b76373e630075ff7d32fc0f9f51294f24 (diff) | |
| parent | 4a6c5607d4502ccd1b15b57d57f17d12b6f257a7 (diff) | |
| download | linux-202595663905384c4c629afd7b897af63a1563b5.tar.xz | |
Merge branch 'for-6.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq into for-6.8
cgroup/for-6.8 is carrying two workqueue changes to allow cpuset to restrict
the CPUs used by unbound workqueues. Unfortunately, this conflicts with a
new bug fix in wq/for-6.7-fixes. The conflict is contextual but can be a bit
confusing to resolve. Pull the fix branch to resolve the conflict.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup')
0 files changed, 0 insertions, 0 deletions