[6.6.y,0/2] Backport of "mptcp: pm: fix RM_ADDR ID for the initial subflow"

Message

Matthieu Baerts Sept. 3, 2024, 10:16 a.m. UTC

87b5896f3f78 ("mptcp: pm: fix RM_ADDR ID for the initial subflow") 
depends on e38b117d7f3b ("mptcp: make pm_remove_addrs_and_subflows 
static") to avoid conflicts. Both can be backported to v6.6 without 
conflicts.

If you prefer, feel free to backport these commits to v6.6:

  e38b117d7f3b 87b5896f3f78

Details:

- e38b117d7f3b ("mptcp: make pm_remove_addrs_and_subflows static")
- 87b5896f3f78 ("mptcp: pm: fix RM_ADDR ID for the initial subflow")

Geliang Tang (1):
  mptcp: make pm_remove_addrs_and_subflows static

Matthieu Baerts (NGI0) (1):
  mptcp: pm: fix RM_ADDR ID for the initial subflow

 net/mptcp/pm_netlink.c | 32 +++++++++++++++++---------------
 net/mptcp/protocol.h   |  2 --
 2 files changed, 17 insertions(+), 17 deletions(-)

Comments

Matthieu Baerts Sept. 4, 2024, 12:56 p.m. UTC | #1

Hi Greg, Sasha,

On 03/09/2024 12:16, Matthieu Baerts (NGI0) wrote:
> 87b5896f3f78 ("mptcp: pm: fix RM_ADDR ID for the initial subflow") 
> depends on e38b117d7f3b ("mptcp: make pm_remove_addrs_and_subflows 
> static") to avoid conflicts. Both can be backported to v6.6 without 
> conflicts.
> 
> If you prefer, feel free to backport these commits to v6.6:
> 
>   e38b117d7f3b 87b5896f3f78
> 
> Details:
> 
> - e38b117d7f3b ("mptcp: make pm_remove_addrs_and_subflows static")
> - 87b5896f3f78 ("mptcp: pm: fix RM_ADDR ID for the initial subflow")

FYI, Sasha has recently queued these 2 patches for v6.6. Nothing else
needs to be done here.

Cheers,
Matt