summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/drivers/net/netdevsim/settings
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-04-03 09:13:09 +0200
committerIngo Molnar <mingo@kernel.org>2024-04-03 09:13:09 +0200
commit9b4e528557944dff694c8afa5a8912de81503bf2 (patch)
tree7d4ff38fbf55e1d32e3384cac0ae2fc80d4ae179 /tools/testing/selftests/drivers/net/netdevsim/settings
parentdfbc411e0a5ea72fdd563b2c7d627e9d993d865c (diff)
parent39cd87c4eb2b893354f3b850f916353f2658ae6f (diff)
Merge tag 'v6.9-rc2' into perf/core, to pick up dependent commits
Pick up fixes that followup patches are going to depend on. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/drivers/net/netdevsim/settings')
-rw-r--r--tools/testing/selftests/drivers/net/netdevsim/settings1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/drivers/net/netdevsim/settings b/tools/testing/selftests/drivers/net/netdevsim/settings
new file mode 100644
index 000000000000..a62d2fa1275c
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/netdevsim/settings
@@ -0,0 +1 @@
+timeout=600