public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
	gregkh@linuxfoundation.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH 6.6.y 0/2] mptcp: sockopt: fix getting freebind & transparent
Date: Thu, 17 Apr 2025 19:27:50 +0200	[thread overview]
Message-ID: <20250417172749.2446163-4-matttbe@kernel.org> (raw)
In-Reply-To: <2025041756-ovary-sandfish-4a21@gregkh>

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(-)

-- 
2.48.1


  reply	other threads:[~2025-04-17 17:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-17 10:31 FAILED: patch "[PATCH] mptcp: sockopt: fix getting freebind & transparent" failed to apply to 6.6-stable tree gregkh
2025-04-17 17:27 ` Matthieu Baerts (NGI0) [this message]
2025-04-17 17:27 ` [PATCH 6.6.y 1/2] mptcp: sockopt: fix getting freebind & transparent Matthieu Baerts (NGI0)
2025-04-18 15:42   ` Sasha Levin
2025-04-17 17:27 ` [PATCH 6.6.y 2/2] selftests: mptcp: add mptcp_lib_wait_local_port_listen Matthieu Baerts (NGI0)
2025-04-18 15:42   ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250417172749.2446163-4-matttbe@kernel.org \
    --to=matttbe@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=mptcp@lists.linux.dev \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox