Linux kernel -stable discussions
 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>, sashal@kernel.org
Subject: [PATCH 5.15.y 0/3] mptcp: fix recent failed backports (20250728)
Date: Wed, 30 Jul 2025 12:28:07 +0200	[thread overview]
Message-ID: <20250730102806.1405622-5-matttbe@kernel.org> (raw)
In-Reply-To: <2025072839-wildly-gala-e85f@gregkh>

Greg recently reported 2 patches that could not be applied without
conflicts in v5.15:

 - 37848a456fc3 ("selftests: mptcp: connect: also cover alt modes")
 - fdf0f60a2bb0 ("selftests: mptcp: connect: also cover checksum")

The first one has been resolved by Sasha in [1].

An additional backport was needed to fix issues when running the new
sendfile test:

 - df9e03aec3b1 ("selftests: mptcp: make sendfile selftest work")

Conflicts have been resolved, and documented in each patch.

Link: https://lore.kernel.org/20250729142019.2718195-1-sashal@kernel.org [1]

Florian Westphal (1):
  selftests: mptcp: make sendfile selftest work

Matthieu Baerts (NGI0) (2):
  selftests: mptcp: connect: also cover alt modes
  selftests: mptcp: connect: also cover checksum

 tools/testing/selftests/net/mptcp/Makefile    |  3 ++-
 .../selftests/net/mptcp/mptcp_connect.c       | 26 ++++++++++++-------
 .../net/mptcp/mptcp_connect_checksum.sh       |  5 ++++
 .../selftests/net/mptcp/mptcp_connect_mmap.sh |  5 ++++
 .../net/mptcp/mptcp_connect_sendfile.sh       |  5 ++++
 5 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh

-- 
2.50.0


  parent reply	other threads:[~2025-07-30 10:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-28 13:48 FAILED: patch "[PATCH] selftests: mptcp: connect: also cover alt modes" failed to apply to 5.15-stable tree gregkh
2025-07-29 14:20 ` [PATCH 5.15.y] selftests: mptcp: connect: also cover alt modes Sasha Levin
2025-07-29 14:32   ` Matthieu Baerts
2025-07-29 14:36     ` Sasha Levin
2025-07-30 10:28 ` Matthieu Baerts (NGI0) [this message]
2025-07-30 10:28 ` [PATCH 5.15.y 1/3] selftests: mptcp: make sendfile selftest work Matthieu Baerts (NGI0)
2025-07-30 16:28   ` Sasha Levin
2025-07-30 10:28 ` [PATCH 5.15.y 2/3] selftests: mptcp: connect: also cover alt modes Matthieu Baerts (NGI0)
2025-07-30 16:28   ` Sasha Levin
2025-07-30 16:41     ` Matthieu Baerts
2025-07-31  1:09       ` Sasha Levin
2025-07-31  9:28         ` Matthieu Baerts
2025-07-30 10:28 ` [PATCH 5.15.y 3/3] selftests: mptcp: connect: also cover checksum Matthieu Baerts (NGI0)
2025-07-30 16:28   ` 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=20250730102806.1405622-5-matttbe@kernel.org \
    --to=matttbe@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=mptcp@lists.linux.dev \
    --cc=sashal@kernel.org \
    --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