Greg recently reported the following patch could not be applied without conflicts in this tree:
- 4b1ff850e0c1 ("mptcp: pm: in-kernel: usable client side with C-flag")
Note that the following patch got applied, but at the wrong place and requiring additional modifications:
- 008385efd05e ("selftests: mptcp: join: validate C-flag + def limit")
Conflicts have been resolved, and documented in each patch.
Matthieu Baerts (NGI0) (2): mptcp: pm: in-kernel: usable client side with C-flag selftests: mptcp: join: validate C-flag + def limit
net/mptcp/pm.c | 7 ++- net/mptcp/pm_netlink.c | 49 ++++++++++++++++++- net/mptcp/protocol.h | 8 +++ .../testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++ 4 files changed, 71 insertions(+), 3 deletions(-)