Skip to content

mptcp: fix recent failed backports

Matthieu Baerts (NGI0) mptcp stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 8 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/6mptcp: define more local variables sknet/mptcp/pm_userspace.c+20 -111 reply
2/6mptcp: add userspace_pm_lookup_addr_by_id helpernet/mptcp/pm_userspace.c+16 -151 reply
3/6mptcp: update local address flags when setting itnet/mptcp/pm_userspace.c+12 -01 reply
4/6mptcp: hold pm lock when deleting entrynet/mptcp/pm_userspace.c+3 -01 reply
5/6mptcp: drop lookup_by_id in lookup_addrnet/mptcp/pm_netlink.c+5 -71 reply
6/6mptcp: pm: use _rcu variant under rcu_read_locknet/mptcp/pm_netlink.c+2 -12 replies

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchMatthieu BaertsMat MartineauGeliang Tang
1/6R-b R-b
2/6R-b R-b R-b R-b
3/6R-b R-b
4/6R-b R-b
5/6R-b R-b
6/6R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 6.6.y 0/6] mptcp: fix recent failed backports

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(-)
Signature · 1 line
2.45.2