mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 16:53:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'linux_kselftest-next-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Browse Source 
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
This commit is contained in:
Linus Torvalds
2026-08-17 20:52:03 -07:00
parent fd89b0be55 649ba27dfa
commit 0f23d56f17
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/ftrace/poll.c
View File

@@ -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;

2
tools/testing/selftests/zram/zram_lib.sh
View File

@@ -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