The following patches could not be applied without conflicts in this
tree:
- fcf04b143346 ("mptcp: sync the msk->sndbuf at accept() time")
- 03f324f3f1f7 ("mptcp: pm: ADD_ADDR rtx: allow ID 0")
- 9634cb35af17 ("mptcp: pm: ADD_ADDR rtx: always decrease sk refcount")
- b7b9a4615697 ("mptcp: pm: ADD_ADDR rtx: free sk if last")
Conflicts have been resolved, and documented in each patch.
Gang Yan (1):
mptcp: sync the msk->sndbuf at accept() time
Matthieu Baerts (NGI0) (3):
mptcp: pm: ADD_ADDR rtx: allow ID 0
mptcp: pm: ADD_ADDR rtx: always decrease sk refcount
mptcp: pm: ADD_ADDR rtx: free sk if last
net/mptcp/pm_netlink.c | 35 ++++++++++++++++++-----------------
net/mptcp/protocol.c | 3 ++-
2 files changed, 20 insertions(+), 18 deletions(-)
--
2.53.0