Failed in applying to current master (
apply log)
net/mptcp/pm_netlink.c | 19 +-
net/mptcp/pm_userspace.c | 75 +++++---
net/mptcp/protocol.h | 2 +
tools/testing/selftests/net/mptcp/diag.sh | 48 +++--
.../selftests/net/mptcp/mptcp_connect.sh | 7 +-
.../testing/selftests/net/mptcp/mptcp_join.sh | 129 ++++---------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 162 +++++++++++++++++
.../selftests/net/mptcp/mptcp_sockopt.sh | 16 +-
.../testing/selftests/net/mptcp/pm_netlink.sh | 4 +-
.../selftests/net/mptcp/simult_flows.sh | 6 +-
.../selftests/net/mptcp/userspace_pm.sh | 172 +++++-------------
11 files changed, 341 insertions(+), 299 deletions(-)