diff options
| author | Tejun Heo <tj@kernel.org> | 2025-03-03 21:02:22 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-03-03 21:02:22 +0300 |
| commit | 8a9b1585e2bf2a4d335774c893f5e80cf9262b6d (patch) | |
| tree | e3060de9a1fbf406d8f4caf27ca54d431910d7e2 /tools/testing | |
| parent | 0f0714a3449ca43671c6aa4cae852c4dfceef0d0 (diff) | |
| parent | 9360dfe4cbd62ff1eb8217b815964931523b75b3 (diff) | |
| download | linux-8a9b1585e2bf2a4d335774c893f5e80cf9262b6d.tar.xz | |
sched_ext: Merge branch 'for-6.14-fixes' into for-6.15
Pull for-6.14-fixes to receive:
9360dfe4cbd6 ("sched_ext: Validate prev_cpu in scx_bpf_select_cpu_dfl()")
which conflicts with:
337d1b354a29 ("sched_ext: Move built-in idle CPU selection policy to a separate file")
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/sched_ext/init_enable_count.c | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/sched_ext/maybe_null.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/sched_ext/init_enable_count.c b/tools/testing/selftests/sched_ext/init_enable_count.c index 0f3eddc7a17a..eddf9e0e26e7 100644 --- a/tools/testing/selftests/sched_ext/init_enable_count.c +++ b/tools/testing/selftests/sched_ext/init_enable_count.c @@ -150,7 +150,7 @@ static enum scx_test_status run(void *ctx) struct scx_test init_enable_count = { .name = "init_enable_count", - .description = "Verify we do the correct amount of counting of init, " + .description = "Verify we correctly count the occurrences of init, " "enable, etc callbacks.", .run = run, }; diff --git a/tools/testing/selftests/sched_ext/maybe_null.c b/tools/testing/selftests/sched_ext/maybe_null.c index 31cfafb0cf65..aacf0c58ca4f 100644 --- a/tools/testing/selftests/sched_ext/maybe_null.c +++ b/tools/testing/selftests/sched_ext/maybe_null.c @@ -43,7 +43,7 @@ static enum scx_test_status run(void *ctx) struct scx_test maybe_null = { .name = "maybe_null", - .description = "Verify if PTR_MAYBE_NULL work for .dispatch", + .description = "Verify if PTR_MAYBE_NULL works for .dispatch", .run = run, }; REGISTER_SCX_TEST(&maybe_null) |