Commit e2f4ac7bab22 ("mptcp: sockopt: fix getting freebind & transparent") failed to apply to 6.6-stable tree. The conflict resolution was easy, see the patch 1/2.
Patch 2/2 has been added, because this warning was visible in the selftests without impacting results on fast enough test environments:
# ./mptcp_join.sh: line 3083: mptcp_lib_wait_local_port_listen: command not found
It looks like the commit 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to port-based endp"), backported in this 6.6-stable tree, was requiring this commit 9369777c2939 ("selftests: mptcp: add mptcp_lib_wait_local_port_listen").
Geliang Tang (1): selftests: mptcp: add mptcp_lib_wait_local_port_listen
Matthieu Baerts (NGI0) (1): mptcp: sockopt: fix getting freebind & transparent
net/mptcp/sockopt.c | 12 ++++++++++ tools/testing/selftests/net/mptcp/diag.sh | 23 +++---------------- .../selftests/net/mptcp/mptcp_connect.sh | 19 +-------------- .../testing/selftests/net/mptcp/mptcp_join.sh | 20 +--------------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 18 +++++++++++++++ .../selftests/net/mptcp/simult_flows.sh | 19 +-------------- 6 files changed, 36 insertions(+), 75 deletions(-)