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

-- 
2.45.2

On Tue, Nov 19, 2024 at 09:35:48AM +0100, Matthieu Baerts (NGI0) wrote:
> 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

now queued up, thanks!

greg k-h