Hi Greg, To be able to apply the last patch without conflicts in v6.6, 4 other clean-up patches are needed. These patches mainly replace existing code with helpers to reduce code duplication. It looks interesting to backport them to ease future backports. I had a few conflicts in mptcp_lib.sh, because some of the new helpers have been backported recently, but not all: so I had to place them between others. Note that these patches are the same the ones I sent earlier for v6.7, no other conflicts. Geliang Tang (5): selftests: mptcp: add evts_get_info helper selftests: mptcp: add chk_subflows_total helper selftests: mptcp: update userspace pm test helpers selftests: mptcp: add mptcp_lib_is_v6 selftests: mptcp: rm subflow with v4/v4mapped addr .../selftests/net/mptcp/mptcp_connect.sh | 16 +- .../testing/selftests/net/mptcp/mptcp_join.sh | 187 ++++++++++-------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 15 ++ .../selftests/net/mptcp/mptcp_sockopt.sh | 8 +- .../selftests/net/mptcp/userspace_pm.sh | 86 ++++---- 5 files changed, 170 insertions(+), 142 deletions(-) -- 2.43.0
