Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251, 2476119, 2476341, 2476252, 2476290, 2476232, 2476274, 2475999, 2476343, 2476275, 2476216, 2476381, 2476256, 2476000, 2476362, 2476345, 2476364, 2476234, 2476346, 2476347, 2476365, 2476276, 2476219, 2476277, 2476402, 2476348, 2476235, 2476383, 2476257, 2476278, 2476236, 2476350, 2476351, 2476307, 2476403, 2476308, 2476258] into oc-release
Change-Id: I6241cf4bbf0187fd5b750821f15def5d84f20cd4
diff --git a/linux_kselftest/kselftest_config.py b/linux_kselftest/kselftest_config.py
index f28048b..5fa217b 100644
--- a/linux_kselftest/kselftest_config.py
+++ b/linux_kselftest/kselftest_config.py
@@ -48,7 +48,6 @@
("timers/nsleep-lat", ["arm", "x86"], [32, 64]),
("timers/set-timer-lat", ["arm", "x86"], [32, 64]),
("timers/inconsistency-check", ["arm", "x86"], [32, 64]),
- ("timers/alarmtimer-suspend", ["arm", "x86"], [32, 64]),
("timers/raw_skew", ["arm", "x86"], [32, 64]),
("timers/threadtest", ["arm", "x86"], [32, 64]),
("timers/set-tai", ["arm", "x86"], [32, 64]),
@@ -59,6 +58,7 @@
# TODO(trong): enable pstore test.
# ("pstore/pstore_tests", ["arm", "x86"], [32, 64]),
("seccomp/seccomp_bpf", ["arm", "x86"], [32, 64]),
+ ("timers/alarmtimer-suspend", ["arm", "x86"], [32, 64]),
("x86/single_step_syscall", ["x86"], [32, 64]),
("x86/sysret_ss_attrs", ["x86"], [32]),
("x86/syscall_nt", ["x86"], [32, 64]),
