| Message ID | 20241118182718.3011097-8-matttbe@kernel.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | mptcp: fix recent failed backports | expand |
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
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. Geliang Tang (5): mptcp: define more local variables sk mptcp: add userspace_pm_lookup_addr_by_id helper mptcp: update local address flags when setting it mptcp: hold pm lock when deleting entry mptcp: drop lookup_by_id in lookup_addr Matthieu Baerts (NGI0) (1): mptcp: pm: use _rcu variant under rcu_read_lock net/mptcp/pm_netlink.c | 15 ++++---- net/mptcp/pm_userspace.c | 77 ++++++++++++++++++++++++++-------------- 2 files changed, 58 insertions(+), 34 deletions(-)