Greg recently reported 3 patches that could not be applied without conflicts in v6.1:
- f8a1d9b18c5e ("mptcp: make fallback action and fallback decision atomic") - def5b7b2643e ("mptcp: plug races between subflow fail and subflow creation") - da9b2fc7b73d ("mptcp: reset fallback status gracefully at disconnect() time")
Conflicts have been resolved, and documented in each patch.
Paolo Abeni (3): mptcp: make fallback action and fallback decision atomic mptcp: plug races between subflow fail and subflow creation mptcp: reset fallback status gracefully at disconnect() time
net/mptcp/options.c | 3 ++- net/mptcp/pm.c | 8 ++++++- net/mptcp/protocol.c | 55 ++++++++++++++++++++++++++++++++++++-------- net/mptcp/protocol.h | 27 +++++++++++++++++----- net/mptcp/subflow.c | 30 +++++++++++++++--------- 5 files changed, 95 insertions(+), 28 deletions(-)