From: Greg Kroah-Hartman Date: Mon, 6 Jun 2022 17:09:34 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.10.121~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bab228dfd9da4c2ff1efc40ed777f4c5264c1c11;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch --- diff --git a/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch b/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch new file mode 100644 index 00000000000..b49a948658e --- /dev/null +++ b/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch @@ -0,0 +1,29 @@ +From 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d Mon Sep 17 00:00:00 2001 +From: Waiman Long +Date: Fri, 13 May 2022 15:09:28 -0400 +Subject: kseltest/cgroup: Make test_stress.sh work if run interactively + +From: Waiman Long + +commit 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d upstream. + +Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT +dir") changes the test_core command path from . to $OUTPUT. However, +variable OUTPUT may not be defined if the command is run interactively. +Fix that by using ${OUTPUT:-.} to cover both cases. + +Signed-off-by: Waiman Long +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/cgroup/test_stress.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/cgroup/test_stress.sh ++++ b/tools/testing/selftests/cgroup/test_stress.sh +@@ -1,4 +1,4 @@ + #!/bin/bash + # SPDX-License-Identifier: GPL-2.0 + +-./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core ++./with_stress.sh -s subsys -s fork ${OUTPUT:-.}/test_core diff --git a/queue-5.10/series b/queue-5.10/series index 9f1f357df0d..4ff88a04937 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -435,3 +435,4 @@ xfs-restore-shutdown-check-in-mapped-write-fault-path.patch xfs-force-log-and-push-ail-to-clear-pinned-inodes-when-aborting-mount.patch xfs-consider-shutdown-in-bmapbt-cursor-delete-assert.patch xfs-assert-in-xfs_btree_del_cursor-should-take-into-account-error.patch +kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch