Here are five changes we've collected and tested in the mptcp-tree:

Patch 1 changes handling of the MPTCP-level snd_next value during the
recovery phase after a subflow link failure.

Patches 2 and 3 are some small refactoring changes to replace some
open-coded bits.

Patch 4 removes an unused field in struct mptcp_sock.

Patch 5 restarts the MPTCP retransmit timer when there is
not-yet-transmitted data to send and all previously sent data has been
acknowledged. This prevents some sending stalls.


Florian Westphal (3):
  mptcp: do not shrink snd_nxt when recovering
  mptcp: remove tx_pending_data
  mptcp: re-arm retransmit timer if data is pending

Geliang Tang (1):
  mptcp: use OPTIONS_MPTCP_MPC

Paolo Abeni (1):
  mptcp: use lockdep_assert_held_once() instead of open-coding it

 net/mptcp/options.c  | 15 +++------
 net/mptcp/protocol.c | 75 ++++++++++++++++++++++++++++++--------------
 net/mptcp/protocol.h |  1 -
 3 files changed, 56 insertions(+), 35 deletions(-)


base-commit: acde891c243c1ed85b19d4d5042bdf00914f5739
-- 
2.33.0

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

On Fri, 24 Sep 2021 14:12:33 -0700 you wrote:
> Here are five changes we've collected and tested in the mptcp-tree:
> 
> Patch 1 changes handling of the MPTCP-level snd_next value during the
> recovery phase after a subflow link failure.
> 
> Patches 2 and 3 are some small refactoring changes to replace some
> open-coded bits.
> 
> [...]

Here is the summary with links:
  - [net-next,1/5] mptcp: do not shrink snd_nxt when recovering
    https://git.kernel.org/netdev/net-next/c/0d199e4363b4
  - [net-next,2/5] mptcp: use OPTIONS_MPTCP_MPC
    https://git.kernel.org/netdev/net-next/c/13ac17a32bf1
  - [net-next,3/5] mptcp: use lockdep_assert_held_once() instead of open-coding it
    https://git.kernel.org/netdev/net-next/c/765ff425528f
  - [net-next,4/5] mptcp: remove tx_pending_data
    https://git.kernel.org/netdev/net-next/c/9e65b6a5aaa3
  - [net-next,5/5] mptcp: re-arm retransmit timer if data is pending
    https://git.kernel.org/netdev/net-next/c/3241a9c02934

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html