The following patches could not be applied without conflicts in this
tree:

- 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
- 42064de57fb8 ("mptcp: close race between scheduler and state change")

I backported the following commit to avoid conflicts:

- ab82e996a1fa ("mptcp: hold mptcp socket before calling tcp_done")

Conflicts (if any) have been resolved, and documented in each patch.

Florian Westphal (1):
  mptcp: hold mptcp socket before calling tcp_done

Paolo Abeni (2):
  mptcp: avoid unneeded actions on subflow reset
  mptcp: close race between scheduler and state change

 net/mptcp/protocol.c | 10 +++++-----
 net/mptcp/protocol.h |  3 ++-
 net/mptcp/subflow.c  | 18 +++++++++++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

-- 
2.55.0