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(-)
--
2.45.2
