From: Greg KH <gregkh@linuxfoundation.org>
To: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Cc: mptcp@lists.linux.dev, stable@vger.kernel.org, sashal@kernel.org
Subject: Re: [PATCH 6.6.y 0/4] mptcp: fix recent failed backports
Date: Mon, 21 Oct 2024 11:37:02 +0200 [thread overview]
Message-ID: <2024102156-diffusive-postnasal-083f@gregkh> (raw)
In-Reply-To: <20241018155734.2548697-6-matttbe@kernel.org>
On Fri, Oct 18, 2024 at 05:57:35PM +0200, Matthieu Baerts (NGI0) wrote:
> Greg recently reported 2 patches that could not be applied without
> conflict in v6.6:
>
> - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")
> - 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to
> port-based endp")
>
> Conflicts have been resolved, and documented in each patch.
>
> Note that there are two extra patches:
>
> - 8c6f6b4bb53a ("selftests: mptcp: join: change capture/checksum as
> bool"): to avoid some conflicts
> - "selftests: mptcp: remove duplicated variables": a dedicated patch
> for v6.6, to fix some previous backport issues.
All queued up, thanks!
greg k-h
prev parent reply other threads:[~2024-10-21 9:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-18 15:57 [PATCH 6.6.y 0/4] mptcp: fix recent failed backports Matthieu Baerts (NGI0)
2024-10-18 15:57 ` [PATCH 6.6.y 1/4] tcp: fix mptcp DSS corruption due to large pmtu xmit Matthieu Baerts (NGI0)
2024-10-18 15:57 ` [PATCH 6.6.y 2/4] selftests: mptcp: join: change capture/checksum as bool Matthieu Baerts (NGI0)
2024-10-18 15:57 ` [PATCH 6.6.y 3/4] selftests: mptcp: join: test for prohibited MPC to port-based endp Matthieu Baerts (NGI0)
2024-10-18 15:57 ` [PATCH 6.6.y 4/4] selftests: mptcp: remove duplicated variables Matthieu Baerts (NGI0)
2024-10-21 9:37 ` Greg KH [this message]
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=2024102156-diffusive-postnasal-083f@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=matttbe@kernel.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