Commit 34d4ddd3 authored Sep 08, 2020 by Linus Torvalds

Merge tag 'linux-kselftest-5.9-rc5' of...

Merge tag 'linux-kselftest-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fix from Shuah Khan:
 "A single fix to timers test to disable timeout setting for tests to
  run and report accurate results"

* tag 'linux-kselftest-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/timers: Turn off timeout setting

parents d6dc7e06 5c1e4f7e

tools/testing/selftests/timers/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \

		TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)

		TEST_FILES := settings

		include ../lib.mk

tools/testing/selftests/timers/settings

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		timeout=0

Admin message