mptcp: fix recent failed backports
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
Patches in v1 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/7 | mptcp: cope racing subflow creation in mptcp_rcv_space_adjustnet/ | +2 | 1 reply | |
| 2/7 | mptcp: define more local variables sknet/ | +20 | 1 reply | |
| 3/7 | mptcp: add userspace_pm_lookup_addr_by_id helpernet/ | +16 | 1 reply | |
| 4/7 | mptcp: update local address flags when setting itnet/ | +12 | 1 reply | |
| 5/7 | mptcp: hold pm lock when deleting entrynet/ | +3 | 1 reply | |
| 6/7 | mptcp: drop lookup_by_id in lookup_addrnet/ | +5 | 1 reply | |
| 7/7 | mptcp: pm: use _rcu variant under rcu_read_locknet/ | +2 | 1 reply |
Reviews trailers per patch
All 7 patches have a Reviewed-by or Acked-by.
| Patch | Matthieu Baerts (NGI0) | Mat Martineau | Geliang Tang |
|---|---|---|---|
| 1/7 | R-b R-b | ||
| 2/7 | R-b R-b | ||
| 3/7 | R-b R-b | R-b R-b | |
| 4/7 | R-b R-b | ||
| 5/7 | R-b R-b | ||
| 6/7 | R-b R-b | ||
| 7/7 | R-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.
Cover letter [PATCH 6.1.y 0/7] mptcp: fix recent failed backports
Greg recently reported 3 patches that could not be applied without conflict in v6.1:
- 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.
1 extra patch has been included, it is supposed to be backported, but it was missing the Cc stable tag and it had conflicts:
- ce7356ae3594 ("mptcp: cope racing subflow creation in mptcp_rcv_space_adjust")
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
Paolo Abeni (1):
mptcp: cope racing subflow creation in mptcp_rcv_space_adjust
net/mptcp/pm_netlink.c | 15 ++++---- net/mptcp/pm_userspace.c | 77 ++++++++++++++++++++++++++-------------- net/mptcp/protocol.c | 3 +- 3 files changed, 60 insertions(+), 35 deletions(-)
Signature · 1 line
2.45.2