]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'cgroup/for-6.11-fixes' into cgroup/for-6.12
authorTejun Heo <tj@kernel.org>
Mon, 5 Aug 2024 20:56:49 +0000 (10:56 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 5 Aug 2024 20:56:49 +0000 (10:56 -1000)
cgroup/for-6.12 is about to receive updates that are dependent on changes
from both for-6.11-fixes and for-6.12. Pull in for-6.11-fixes.

Signed-off-by: Tejun Heo <tj@kernel.org>
1  2 
kernel/cgroup/cpuset.c

Simple merge