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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 Apr 2021 10:26:56 +1000

Hi all,

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

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

between commit:

  31c330b346a6 ("kbuild: replace LANG=C with LC_ALL=C")

from the kbuild tree and commit:

  5888a61cb4e0 ("selftests: mptcp: launch mptcp_connect with timeout")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 1d2a6e7b877c,9236609731b1..000000000000
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@@ -273,7 -274,7 +274,7 @@@ check_mptcp_disabled(
  	ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=0
  
  	local err=0
- 	LC_ALL=C ip netns exec ${disabled_ns} ./mptcp_connect -t $timeout -p 10000 -s MPTCP 127.0.0.1 < "$cin" 2>&1 | \
 -	LANG=C ip netns exec ${disabled_ns} ./mptcp_connect -p 10000 -s MPTCP 127.0.0.1 < "$cin" 2>&1 | \
++	LC_ALL=C ip netns exec ${disabled_ns} ./mptcp_connect -p 10000 -s MPTCP 127.0.0.1 < "$cin" 2>&1 | \
  		grep -q "^socket: Protocol not available$" && err=1
  	ip netns delete ${disabled_ns}