Patches "mptcp: pm: don't try to create sf if alloc failed" and "mptcp:
pm: do not ignore 'subflow' if 'signal' flag is also set" depend on
"mptcp: pm: reduce indentation blocks" which depends on "mptcp: pass
addr to mptcp_pm_alloc_anno_list". These two patches are simple ones,
doing some refactoring that can be picked to ease the backports.

Including these patches avoids conflicts with the two other patches.

While at it, also picked the modifications of the selftests to validate
the other modifications. Note that this last patch has been modified to
work on v6.1.

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

  528cb5f2a1e8 c95eb32ced82 cd7c957f936f 85df533a787b 4d2868b5d191

In this order, and thanks to 528cb5f2a1e8 and c95eb32ced82, there are no
conflicts.

Details:

- 528cb5f2a1e8 ("mptcp: pass addr to mptcp_pm_alloc_anno_list")
- c95eb32ced82 ("mptcp: pm: reduce indentation blocks")
- cd7c957f936f ("mptcp: pm: don't try to create sf if alloc failed")
- 85df533a787b ("mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set")
- 4d2868b5d191 ("selftests: mptcp: join: test both signal & subflow")


Geliang Tang (1):
  mptcp: pass addr to mptcp_pm_alloc_anno_list

Matthieu Baerts (NGI0) (4):
  mptcp: pm: reduce indentation blocks
  mptcp: pm: don't try to create sf if alloc failed
  mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
  selftests: mptcp: join: test both signal & subflow

 net/mptcp/pm_netlink.c                        | 49 ++++++++++++-------
 net/mptcp/pm_userspace.c                      |  2 +-
 net/mptcp/protocol.h                          |  2 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++
 4 files changed, 47 insertions(+), 20 deletions(-)

-- 
2.45.2

On Tue, Aug 13, 2024 at 11:28:16AM +0200, Matthieu Baerts (NGI0) wrote:
> Patches "mptcp: pm: don't try to create sf if alloc failed" and "mptcp:
> pm: do not ignore 'subflow' if 'signal' flag is also set" depend on
> "mptcp: pm: reduce indentation blocks" which depends on "mptcp: pass
> addr to mptcp_pm_alloc_anno_list". These two patches are simple ones,
> doing some refactoring that can be picked to ease the backports.
> 
> Including these patches avoids conflicts with the two other patches.
> 
> While at it, also picked the modifications of the selftests to validate
> the other modifications. Note that this last patch has been modified to
> work on v6.1.
> 
> If you prefer, feel free to backport these 5 commits to v6.1:
> 
>   528cb5f2a1e8 c95eb32ced82 cd7c957f936f 85df533a787b 4d2868b5d191
> 
> In this order, and thanks to 528cb5f2a1e8 and c95eb32ced82, there are no
> conflicts.

All queued up, thanks.

greg k-h