linux-next: manual merge of the net-next tree with the net tree

[broonie]

Hi all,

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

  tools/testing/selftests/net/mptcp/mptcp_join.sh

between commit:

  6ef84b1517e08 ("selftests: mptcp: more robust signal race test")

from the net tree and commit:

  34aa6e3bccd86 ("selftests: mptcp: add ip mptcp wrappers")

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/mptcp/mptcp_join.sh
index 0c8a2a20b96cf,725924012b412..0000000000000
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@@ -1163,20 -1287,17 +1302,21 @@@ signal_address_tests(
  
  	# signal addresses race test
  	reset
- 	ip netns exec $ns1 ./pm_nl_ctl limits 4 4
- 	ip netns exec $ns2 ./pm_nl_ctl limits 4 4
- 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags signal
- 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
- 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal
- 	ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal
- 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags signal
- 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags signal
- 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal
- 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal
++
+ 	pm_nl_set_limits $ns1 4 4
+ 	pm_nl_set_limits $ns2 4 4
+ 	pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
+ 	pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ 	pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ 	pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
+ 	pm_nl_add_endpoint $ns2 10.0.1.2 flags signal
+ 	pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
+ 	pm_nl_add_endpoint $ns2 10.0.3.2 flags signal
+ 	pm_nl_add_endpoint $ns2 10.0.4.2 flags signal
 -	run_tests $ns1 $ns2 10.0.1.1
 +
 +	# the peer could possibly miss some addr notification, allow retransmission
 +	ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
 +	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
  	chk_join_nr "signal addresses race test" 3 3 3
  
  	# the server will not signal the address terminating