Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  tools/testing/selftests/net/lib.sh

between commit:

  dd6a23bac306b ("selftests: net: make busywait timeout clock portable")

from the net tree and commit:

  895bad9cc4cec ("selftests: net: make busywait timeout clock portable")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc tools/testing/selftests/net/lib.sh
index d46d2cec89e45,d389a965d8f19..0000000000000
--- a/tools/testing/selftests/net/lib.sh
+++ b/tools/testing/selftests/net/lib.sh
@@@ -93,10 -89,8 +89,9 @@@ loopy_wait(
  {
  	local sleep_cmd=$1; shift
  	local timeout_ms=$1; shift
- 	local start_time
 +	local current_time
  
- 	start_time=$(timestamp_ms) || return
+ 	local start_time=$(timestamp_ms)
  	while true
  	do
  		local out