Commit 8f3d8491 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.11-rc3' of... 

Merge tag 'linux-kselftest-next-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "Two minor fixes to vDSO test changes in this merge window"

* tag 'linux-kselftest-next-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/vDSO: fix -Wformat warning in vdso_test_correctness
  selftests/vDSO: add additional binaries to .gitignore
parents 50dbd96e df00d029

tools/testing/selftests/vDSO/.gitignore

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

vdso_test

vdso_test_abi

vdso_test_clock_getres

vdso_test_correctness

vdso_test_gettimeofday

vdso_test_getcpu

vdso_standalone_test_x86

tools/testing/selftests/vDSO/vdso_test_correctness.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static void test_one_clock_gettime64(int clock, const char *name) 
		return;

	}



	printf("\t%llu.%09ld %llu.%09ld %llu.%09ld\n",

	printf("\t%llu.%09lld %llu.%09lld %llu.%09lld\n",

	       (unsigned long long)start.tv_sec, start.tv_nsec,

	       (unsigned long long)vdso.tv_sec, vdso.tv_nsec,

	       (unsigned long long)end.tv_sec, end.tv_nsec);