diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2022-09-25 04:14:12 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2022-09-25 04:14:12 +0300 |
| commit | b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 (patch) | |
| tree | 77795fbece4fc61a659ed97c70d798ca81f35bb8 /tools/testing/selftests/drivers/net/bonding/settings | |
| parent | 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 (diff) | |
| parent | 67feaba413ec68daf4124e9870878899b4ed9a0e (diff) | |
| download | linux-b3bbcc5d1da1b654091dad15980b3d58fdae0fc6.tar.xz | |
Merge branch 'for-6.0/dax' into libnvdimm-fixes
Pick up another "Soft Reservation" fix for v6.0-final on top of some
straggling nvdimm fixes that missed v5.19.
Diffstat (limited to 'tools/testing/selftests/drivers/net/bonding/settings')
| -rw-r--r-- | tools/testing/selftests/drivers/net/bonding/settings | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/drivers/net/bonding/settings b/tools/testing/selftests/drivers/net/bonding/settings new file mode 100644 index 000000000000..867e118223cd --- /dev/null +++ b/tools/testing/selftests/drivers/net/bonding/settings @@ -0,0 +1 @@ +timeout=60 |