Just move the declaration of __mptcp_unaccepted_force_close() lower to
avoid conflicts when merging with the current net-next, see
commit ddb1a072f858 ("mptcp: move first subflow allocation at mpc access
time").

By doing that, I can send our two last patches queued for -net without
creating conflicts.

At the end, __mptcp_unaccepted_force_close() is declared after
mptcp_cancel_work() (but before __mptcp_close()).

I'm going to apply this patch and then sent the two fix to netdev. I
hope that's OK!

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---

Notes:
    to be squashed in "mptcp: fix accept vs worker race"

 net/mptcp/protocol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 33589f98473e..d6469b6ab38e 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -632,9 +632,9 @@ void mptcp_subflow_reset(struct sock *ssk);
 void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk);
 void mptcp_sock_graft(struct sock *sk, struct socket *parent);
 struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
-void __mptcp_unaccepted_force_close(struct sock *sk);
 bool __mptcp_close(struct sock *sk, long timeout);
 void mptcp_cancel_work(struct sock *sk);
+void __mptcp_unaccepted_force_close(struct sock *sk);
 void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk);
 
 bool mptcp_addresses_equal(const struct mptcp_addr_info *a,

base-commit: 97397b840098c47088efb4dd3c8052e7bb989020
-- 
2.39.2

Hello,

On 17/04/2023 15:41, Matthieu Baerts wrote:
> Just move the declaration of __mptcp_unaccepted_force_close() lower to
> avoid conflicts when merging with the current net-next, see
> commit ddb1a072f858 ("mptcp: move first subflow allocation at mpc access
> time").
> 
> By doing that, I can send our two last patches queued for -net without
> creating conflicts.
> 
> At the end, __mptcp_unaccepted_force_close() is declared after
> mptcp_cancel_work() (but before __mptcp_close()).
> 
> I'm going to apply this patch and then sent the two fix to netdev. I
> hope that's OK!

Just did:

New patches for t/upstream:
- d8d5315ec77f: "squashed" in "mptcp: fix accept vs worker race"
- 680788b99efb: conflict in top-bases/t/DO-NOT-MERGE-git-markup-net-next
(fix the previous conflict resolution)
- Results: 9787cab4f315..9a0205674b16 (export-net)
- Results: 1fcf1c7d50dc..f43ad21ca737 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20230417T134909
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230417T134909

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net