tgupdate: merge t/upstream base into t/upstream

Author: matttbe

net/mptcp/protocol.c

@@ -2518,13 +2518,6 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
 		subflow->lent_mem_frag = 0;
 	}
 
-	/* Do not pass RX data to the msk, even if the subflow socket is not
-	 * going to be freed (i.e. even for the first subflow on graceful
-	 * subflow close.
-	 */
-	lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
-	subflow->closing = 1;
-
 	/* If the first subflow moved to a close state before accept, e.g. due
 	 * to an incoming reset or listener shutdown, the subflow socket is
 	 * already deleted by inet_child_forget() and the mptcp socket can't