On Fri, Aug 09, 2024 at 12:55:39PM +0200, Matthieu Baerts (NGI0) wrote: > From: Geliang Tang <geliang.tang@xxxxxxxx> > > commit dc886bce753cc2cf3c88ec5c7a6880a4e17d65ba upstream. > > Rename local_address() with "mptcp_" prefix and export it in protocol.h. > > This function will be re-used in the common PM code (pm.c) in the > following commit. > > Signed-off-by: Geliang Tang <geliang.tang@xxxxxxxx> > Reviewed-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx> > Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx> > Reviewed-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx> > Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> > Stable-dep-of: 6834097fc38c ("mptcp: pm: fix backup support in signal endpoints") > [ Conflicts in pm_netlink.c and protocol.h, because the context has > changed in commit 4638de5aefe5 ("mptcp: handle local addrs announced > by userspace PMs") which is not in this version. This commit is > unrelated to this modification. Also some parts using 'local_address' > are not in this version, that's OK, we don't need to do anything with > them. ] > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> All backports now queued up, thanks! greg k-h