summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-09-27 08:51:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-09-27 08:51:45 -0700
commitb1fa457bddf009907b023bc0c09ba4eca3191a8e (patch)
treef4f64520b9dd4558c7a26a045651fb3ca8ea61af /tools
parent7cdf91542e1ed03aa8f5ab029702b3abde5be6d5 (diff)
parent31c88350b7dd1522792f726f79607f31bb55c50f (diff)
downloadlinux-stable-b1fa457bddf009907b023bc0c09ba4eca3191a8e.tar.gz
linux-stable-b1fa457bddf009907b023bc0c09ba4eca3191a8e.zip
Merge tag 'cgroup-for-7.3-rc4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: - A cpuset partition could claim CPUs an ancestor partition already held exclusively. Restore the rejection an earlier change had turned into a warning. * tag 'cgroup-for-7.3-rc4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup/cpuset: Return PERR_NOCPUS in remote_partition_enable() on subpartitions_cpus conflict
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/cgroup/test_cpuset_prs.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
index 131d8b455..7efd5e645 100755
--- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh
+++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
@@ -298,6 +298,8 @@ TEST_MATRIX=(
" C0-4:X2-4 C1-4:X2-4:P2 C2-4:X4:P1 \
. . . X1 . 0 A1:0-1|A2:2-4|A3:2-4 \
A1:P0|A2:P2|A3:P-1 2-4"
+ " CX1-3:P1 CX1-3 CX1-3 . . . P1 . 0 A1:1-3|A2:1-3|A3:1-3 \
+ A1:P1|A2:P0|A3:P-1"
# Remote partition offline tests
" C0-3 C1-3 C2-3 . X2-3 X2-3 X2-3:P2:O2=0 . 0 A1:0-1|A2:1|A3:3 A1:P0|A3:P2 2-3"