The following patches could not be applied without conflicts in this
tree:

- 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
- 42064de57fb8 ("mptcp: close race between scheduler and state change")
- f3ef03357396 ("mptcp: fix bad accounting in __mptcp_subflow_push_pending()")

Conflicts (if any) have been resolved, and documented in each patch.

v2: Drop these two patches that have been already backported to this 
    version, but git didn't complain about that. Instead, resolve a 
    small conflict in patch 1 ("mptcp: avoid unneeded actions on subflow
    reset"): decrement the '__unused' variable.

Paolo Abeni (3):
  mptcp: avoid unneeded actions on subflow reset
  mptcp: close race between scheduler and state change
  mptcp: fix bad accounting in __mptcp_subflow_push_pending()

 net/mptcp/protocol.c | 13 ++++++++-----
 net/mptcp/protocol.h |  3 ++-
 net/mptcp/subflow.c  | 11 +++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

-- 
2.55.0

On Sun, Sep 20, 2026 at 11:41:36AM +0200, Matthieu Baerts (NGI0) wrote:
> The following patches could not be applied without conflicts in this
> tree:
> 
> - 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
> - 42064de57fb8 ("mptcp: close race between scheduler and state change")
> - f3ef03357396 ("mptcp: fix bad accounting in __mptcp_subflow_push_pending()")
> 
> Conflicts (if any) have been resolved, and documented in each patch.
> 
> v2: Drop these two patches that have been already backported to this 
>     version, but git didn't complain about that. Instead, resolve a 
>     small conflict in patch 1 ("mptcp: avoid unneeded actions on subflow
>     reset"): decrement the '__unused' variable.
> 
> Paolo Abeni (3):
>   mptcp: avoid unneeded actions on subflow reset
>   mptcp: close race between scheduler and state change
>   mptcp: fix bad accounting in __mptcp_subflow_push_pending()
> 
>  net/mptcp/protocol.c | 13 ++++++++-----
>  net/mptcp/protocol.h |  3 ++-
>  net/mptcp/subflow.c  | 11 +++++++++++
>  3 files changed, 21 insertions(+), 6 deletions(-)

Now queued up, thanks.

greg k-h