diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-21 17:35:22 -0400 |
| commit | 3d09198243b89457649241fb63f809a96a22a8ce (patch) | |
| tree | f8f62d4a0b47ebc44682363a8d23b8963e1ca3e9 /tools/testing | |
| parent | 52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a (diff) | |
| parent | 48b6bbef9a1789f0365c1a385879a1fea4460016 (diff) | |
| download | op-kernel-dev-3d09198243b89457649241fb63f809a96a22a8ce.zip op-kernel-dev-3d09198243b89457649241fb63f809a96a22a8ce.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/ntb/ntb_test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh index a676d3e..13f5198 100755 --- a/tools/testing/selftests/ntb/ntb_test.sh +++ b/tools/testing/selftests/ntb/ntb_test.sh @@ -305,7 +305,7 @@ function perf_test() echo "Running remote perf test $WITH DMA" write_file "" $REMOTE_PERF/run echo -n " " - read_file $LOCAL_PERF/run + read_file $REMOTE_PERF/run echo " Passed" _modprobe -r ntb_perf |
