summaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/drivers/net/bonding/settings
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-04 06:21:02 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-04 06:21:02 -0800
commita802f50d6e92298d44a806d326a2ba3eefa6db72 (patch)
tree40cafff98f5248d0121656fc538e65dc9baa64b2 /tools/testing/selftests/drivers/net/bonding/settings
parentfccc9d9233f918ee50cf2955ae7134a7f3418351 (diff)
parent54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 (diff)
downloadlinux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.gz
linux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.bz2
linux-stable-a802f50d6e92298d44a806d326a2ba3eefa6db72.zip
Merge 6.8-rc3 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/drivers/net/bonding/settings')
-rw-r--r--tools/testing/selftests/drivers/net/bonding/settings2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/drivers/net/bonding/settings b/tools/testing/selftests/drivers/net/bonding/settings
index 6091b45d226b..79b65bdf05db 100644
--- a/tools/testing/selftests/drivers/net/bonding/settings
+++ b/tools/testing/selftests/drivers/net/bonding/settings
@@ -1 +1 @@
-timeout=120
+timeout=1200