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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 16 May 2022 11:14:35 +1000

Hi all,

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

  net/mptcp/pm.c

between commit:

  95d686517884 ("mptcp: fix subflow accounting on close")

from the net tree and commit:

  4d25247d3ae4 ("mptcp: bypass in-kernel PM restrictions for non-kernel PMs")

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 net/mptcp/pm.c
index aa51b100e033,cdc2d79071f8..000000000000
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@@ -178,7 -181,9 +181,8 @@@ void mptcp_pm_subflow_check_next(struc
  	struct mptcp_pm_data *pm = &msk->pm;
  	bool update_subflows;
  
- 	update_subflows = subflow->request_join || subflow->mp_join;
 -	update_subflows = (ssk->sk_state == TCP_CLOSE) &&
 -			  (subflow->request_join || subflow->mp_join) &&
++	update_subflows = (subflow->request_join || subflow->mp_join) &&
+ 			  mptcp_pm_is_kernel(msk);
  	if (!READ_ONCE(pm->work_pending) && !update_subflows)
  		return;