This file is the only one from this directory not to have all these
header inclusions sorted by type and alphabetical order.

Adapt them, to ease the reading, prevent conflicts during potential
future backport modifying these lines, and also to avoid having UAPI
header inclusions before libc ones, see [1].

Link: https://lore.kernel.org/20260120-uapi-sockaddr-v2-1-63c319111cf6@linutronix.de
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_diag.c | 29 ++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing/selftests/net/mptcp/mptcp_diag.c
index 8e0b1b8d84b6..5e222ba977e4 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_diag.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c
@@ -1,21 +1,24 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2025, Kylin Software */
 
-#include <linux/sock_diag.h>
-#include <linux/rtnetlink.h>
-#include <linux/inet_diag.h>
-#include <linux/netlink.h>
-#include <linux/compiler.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <linux/tcp.h>
-#include <arpa/inet.h>
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+
+#include <arpa/inet.h>
+
+#include <netinet/in.h>
+
+#include <linux/compiler.h>
+#include <linux/inet_diag.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/sock_diag.h>
+#include <linux/tcp.h>
 
 #ifndef IPPROTO_MPTCP
 #define IPPROTO_MPTCP 262

---
base-commit: 50e7f60d4f2aecec1adf329735dd16a88d7d494a
change-id: 20260130-mptcp-sft-sort-includes-8fd4a44ba169

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 2 failed test(s): packetdrill_dss packetdrill_fastopen 🔴
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/21526668294

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/aa1975519da4
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1048929


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)

On Fri, Jan 30, 2026 at 11:41:43AM +0100, Matthieu Baerts (NGI0) wrote:
> This file is the only one from this directory not to have all these
> header inclusions sorted by type and alphabetical order.
> 
> Adapt them, to ease the reading, prevent conflicts during potential
> future backport modifying these lines, and also to avoid having UAPI
> header inclusions before libc ones, see [1].
> 
> Link: https://lore.kernel.org/20260120-uapi-sockaddr-v2-1-63c319111cf6@linutronix.de
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Thanks!

Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>

> ---
>  tools/testing/selftests/net/mptcp/mptcp_diag.c | 29 ++++++++++++++------------
>  1 file changed, 16 insertions(+), 13 deletions(-)

(...)

On Fri, 2026-01-30 at 11:53 +0100, Thomas Weißschuh wrote:
> On Fri, Jan 30, 2026 at 11:41:43AM +0100, Matthieu Baerts (NGI0)
> wrote:
> > This file is the only one from this directory not to have all these
> > header inclusions sorted by type and alphabetical order.
> > 
> > Adapt them, to ease the reading, prevent conflicts during potential
> > future backport modifying these lines, and also to avoid having
> > UAPI
> > header inclusions before libc ones, see [1].
> > 
> > Link:
> > https://lore.kernel.org/20260120-uapi-sockaddr-v2-1-63c319111cf6@linutronix.de
> > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> Thanks!
> 
> Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>

Looks good to me too!

    Reviewed-by: Geliang Tang <geliang@kernel.org>

Thanks,
-Geliang

> 
> > ---
> >  tools/testing/selftests/net/mptcp/mptcp_diag.c | 29
> > ++++++++++++++------------
> >  1 file changed, 16 insertions(+), 13 deletions(-)
> 
> (...)

Hi Geliang, Thomas,

On 30/01/2026 14:50, Geliang Tang wrote:
> On Fri, 2026-01-30 at 11:53 +0100, Thomas Weißschuh wrote:
>> On Fri, Jan 30, 2026 at 11:41:43AM +0100, Matthieu Baerts (NGI0)
>> wrote:
>>> This file is the only one from this directory not to have all these
>>> header inclusions sorted by type and alphabetical order.
>>>
>>> Adapt them, to ease the reading, prevent conflicts during potential
>>> future backport modifying these lines, and also to avoid having
>>> UAPI
>>> header inclusions before libc ones, see [1].
>>>
>>> Link:
>>> https://lore.kernel.org/20260120-uapi-sockaddr-v2-1-63c319111cf6@linutronix.de
>>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>>
>> Thanks!
>>
>> Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> 
> Looks good to me too!
> 
>     Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you for the reviews!

Now in our tree:

New patches for t/upstream:
- 463bdbb2c21d: selftests: mptcp: diag: sort all #include
- Results: 847c469e539c..1f27d14ad280 (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/d713fc185b84b7e4f02beff96022692bce694318/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.