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/6] mptcp: fix recent failed backports
Date: Tue, 19 Nov 2024 14:02:46 +0100 [thread overview]
Message-ID: <2024111938-agenda-vertebrae-d9ce@gregkh> (raw)
In-Reply-To: <20241118182718.3011097-8-matttbe@kernel.org>
On Mon, Nov 18, 2024 at 07:27:18PM +0100, Matthieu Baerts (NGI0) wrote:
> Greg recently reported 3 patches that could not be applied without
> conflict in v6.6:
>
> - e0266319413d ("mptcp: update local address flags when setting it")
> - f642c5c4d528 ("mptcp: hold pm lock when deleting entry")
> - db3eab8110bc ("mptcp: pm: use _rcu variant under rcu_read_lock")
>
> Conflicts, if any, have been resolved, and documented in each patch.
>
> Note that there are 3 extra patches added to avoid some conflicts:
>
> - 14cb0e0bf39b ("mptcp: define more local variables sk")
> - 06afe09091ee ("mptcp: add userspace_pm_lookup_addr_by_id helper")
> - af250c27ea1c ("mptcp: drop lookup_by_id in lookup_addr")
>
> The Stable-dep-of tags have been added to these patches.
Now queued up, thanks!
greg k-h
prev parent reply other threads:[~2024-11-19 13:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-18 18:27 [PATCH 6.6.y 0/6] mptcp: fix recent failed backports Matthieu Baerts (NGI0)
2024-11-18 18:27 ` [PATCH 6.6.y 1/6] mptcp: define more local variables sk Matthieu Baerts (NGI0)
2024-11-19 12:31 ` Sasha Levin
2024-11-18 18:27 ` [PATCH 6.6.y 2/6] mptcp: add userspace_pm_lookup_addr_by_id helper Matthieu Baerts (NGI0)
2024-11-19 12:31 ` Sasha Levin
2024-11-18 18:27 ` [PATCH 6.6.y 3/6] mptcp: update local address flags when setting it Matthieu Baerts (NGI0)
2024-11-19 12:31 ` Sasha Levin
2024-11-18 18:27 ` [PATCH 6.6.y 4/6] mptcp: hold pm lock when deleting entry Matthieu Baerts (NGI0)
2024-11-19 12:30 ` Sasha Levin
2024-11-18 18:27 ` [PATCH 6.6.y 5/6] mptcp: drop lookup_by_id in lookup_addr Matthieu Baerts (NGI0)
2024-11-19 12:31 ` Sasha Levin
2024-11-18 18:27 ` [PATCH 6.6.y 6/6] mptcp: pm: use _rcu variant under rcu_read_lock Matthieu Baerts (NGI0)
2024-11-19 12:30 ` Sasha Levin
2024-11-19 15:34 ` Matthieu Baerts
2024-11-19 13:02 ` 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=2024111938-agenda-vertebrae-d9ce@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