diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-17 20:52:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-17 20:52:03 -0700 |
| commit | 0f23d56f17fdfc7db69d51f64c8b91bbab947aa9 (patch) | |
| tree | 41b30de106e7e62710d5fc06994551fae9e442d1 | |
| parent | fd89b0be5503dbbbdbd53c8158ea6ba0e57357fc (diff) | |
| parent | 649ba27dfac784427a01f9c95c09ecbcb88900d8 (diff) | |
| download | linux-master.tar.gz | |
Merge tag 'linux_kselftest-next-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftestHEADmaster
Pull kselftest update from Shuah Khan:
"Fix zram test failure in kernel_gte() when using dash and a spelling
error in ftrace poll test comment"
* tag 'linux_kselftest-next-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/zram: fix kernel_gte() for POSIX sh
selftests/ftrace: fix spelling error in poll test comment
| -rw-r--r-- | tools/testing/selftests/ftrace/poll.c | 2 | ||||
| -rwxr-xr-x | tools/testing/selftests/zram/zram_lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/ftrace/poll.c b/tools/testing/selftests/ftrace/poll.c index 53258f7515e77..4da86a20dc85d 100644 --- a/tools/testing/selftests/ftrace/poll.c +++ b/tools/testing/selftests/ftrace/poll.c @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) } close(pfd.fd); - /* If timeout happned (ret == 0), exit code is 1 */ + /* If timeout happened (ret == 0), exit code is 1 */ if (ret == 0) return 1; diff --git a/tools/testing/selftests/zram/zram_lib.sh b/tools/testing/selftests/zram/zram_lib.sh index 21ec1966de76c..0d44d83888f9d 100755 --- a/tools/testing/selftests/zram/zram_lib.sh +++ b/tools/testing/selftests/zram/zram_lib.sh @@ -37,7 +37,7 @@ kernel_gte() if [ $kernel_major -gt $major ]; then return 0 - elif [[ $kernel_major -eq $major && $kernel_minor -ge $minor ]]; then + elif [ $kernel_major -eq $major ] && [ $kernel_minor -ge $minor ]; then return 0 fi |