[PATCH] selftests: net: sort .gitignore file

[PATCH] selftests: net: sort .gitignore file

[Axel Rasmussen]

This is the result of `sort tools/testing/selftests/net/.gitignore`, but
preserving the comment at the top.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
 tools/testing/selftests/net/.gitignore | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
index 02abf8fdfd3a..e64419c3fed8 100644
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@ -1,43 +1,43 @@
 # SPDX-License-Identifier: GPL-2.0-only
+cmsg_sender
+fin_ack_lat
+gro
+hwtstamp_config
+ioam6_parser
+io_uring_zerocopy_tx
+ip_defrag
 ipsec
+ipv6_flowlabel
+ipv6_flowlabel_mgr
 msg_zerocopy
-socket
+nettest
 psock_fanout
 psock_snd
 psock_tpacket
-stress_reuseport_listen
+reuseaddr_conflict
+reuseaddr_ports_exhausted
 reuseport_addr_any
 reuseport_bpf
 reuseport_bpf_cpu
 reuseport_bpf_numa
 reuseport_dualstack
-reuseaddr_conflict
-tcp_mmap
-udpgso
-udpgso_bench_rx
-udpgso_bench_tx
-tcp_inq
-tls
-txring_overwrite
-ip_defrag
-ipv6_flowlabel
-ipv6_flowlabel_mgr
-so_txtime
-tcp_fastopen_backup_key
-nettest
-fin_ack_lat
-reuseaddr_ports_exhausted
-hwtstamp_config
 rxtimestamp
-timestamping
-txtimestamp
+socket
 so_netns_cookie
+so_txtime
+stress_reuseport_listen
+tap
+tcp_fastopen_backup_key
+tcp_inq
+tcp_mmap
 test_unix_oob
-gro
-ioam6_parser
+timestamping
+tls
 toeplitz
 tun
-cmsg_sender
+txring_overwrite
+txtimestamp
+udpgso
+udpgso_bench_rx
+udpgso_bench_tx
 unix_connect
-tap
-io_uring_zerocopy_tx
-- 
2.37.2.672.g94769d06f0-goog

Re: [PATCH] selftests: net: sort .gitignore file

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 29 Aug 2022 11:47:48 -0700 you wrote:
> This is the result of `sort tools/testing/selftests/net/.gitignore`, but
> preserving the comment at the top.
> 
> Suggested-by: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
> ---
>  tools/testing/selftests/net/.gitignore | 52 +++++++++++++-------------
>  1 file changed, 26 insertions(+), 26 deletions(-)

Here is the summary with links:
  - selftests: net: sort .gitignore file
    https://git.kernel.org/netdev/net/c/5a3a59981027

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH] selftests: net: sort .gitignore file

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

Hello,

On 29/08/2022 20:47, Axel Rasmussen wrote:
> This is the result of `sort tools/testing/selftests/net/.gitignore`, but
> preserving the comment at the top.

FYI, we got a small conflict (as expected by Jakub) when merging -net in
net-next in the MPTCP tree due to this patch applied in -net:

  5a3a59981027 ("selftests: net: sort .gitignore file")

and these ones from net-next:

  c35ecb95c448 ("selftests/net: Add test for timing a bind request to a
port with a populated bhash entry")
  1be9ac87a75a ("selftests/net: Add sk_bind_sendto_listen and
sk_connect_zero_addr")

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email: new entries have been added in the
list respecting the alphabetical order.

I'm sharing this thinking it can help others but if it only creates
noise, please tell me! :-)

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/4151695b70b6
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

[-- Attachment #2: 4151695b70b6889c0be046fc6b861f4fba2efff7.patch --]
[-- Type: text/x-patch, Size: 1298 bytes --]

diff --cc tools/testing/selftests/net/.gitignore
index bec5cf96984c,de7d5cc15f85..3d7adee7a3e6
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@@ -1,7 -1,15 +1,16 @@@
  # SPDX-License-Identifier: GPL-2.0-only
++bind_bhash
+ cmsg_sender
+ fin_ack_lat
+ gro
+ hwtstamp_config
+ ioam6_parser
+ ip_defrag
  ipsec
+ ipv6_flowlabel
+ ipv6_flowlabel_mgr
  msg_zerocopy
- socket
+ nettest
  psock_fanout
  psock_snd
  psock_tpacket
@@@ -11,35 -20,23 +21,25 @@@ reuseport_bp
  reuseport_bpf_cpu
  reuseport_bpf_numa
  reuseport_dualstack
- reuseaddr_conflict
- tcp_mmap
- udpgso
- udpgso_bench_rx
- udpgso_bench_tx
- tcp_inq
- tls
- txring_overwrite
- ip_defrag
- ipv6_flowlabel
- ipv6_flowlabel_mgr
- so_txtime
- tcp_fastopen_backup_key
- nettest
- fin_ack_lat
- reuseaddr_ports_exhausted
- hwtstamp_config
  rxtimestamp
- timestamping
- txtimestamp
++sk_bind_sendto_listen
++sk_connect_zero_addr
+ socket
  so_netns_cookie
+ so_txtime
+ stress_reuseport_listen
+ tap
+ tcp_fastopen_backup_key
+ tcp_inq
+ tcp_mmap
  test_unix_oob
- gro
- ioam6_parser
+ timestamping
+ tls
  toeplitz
  tun
- cmsg_sender
+ txring_overwrite
+ txtimestamp
+ udpgso
+ udpgso_bench_rx
+ udpgso_bench_tx
  unix_connect
- tap
- bind_bhash
- sk_bind_sendto_listen
- sk_connect_zero_addr

Re: [PATCH] selftests: net: sort .gitignore file

[Jakub Kicinski]

On Thu, 1 Sep 2022 12:15:02 +0200 Matthieu Baerts wrote:
> Hello,
> 
> On 29/08/2022 20:47, Axel Rasmussen wrote:
> > This is the result of `sort tools/testing/selftests/net/.gitignore`, but
> > preserving the comment at the top.  
> 
> FYI, we got a small conflict (as expected by Jakub) when merging -net in
> net-next in the MPTCP tree due to this patch applied in -net:
> 
>   5a3a59981027 ("selftests: net: sort .gitignore file")
> 
> and these ones from net-next:
> 
>   c35ecb95c448 ("selftests/net: Add test for timing a bind request to a
> port with a populated bhash entry")
>   1be9ac87a75a ("selftests/net: Add sk_bind_sendto_listen and
> sk_connect_zero_addr")
> 
> The conflict has been resolved on our side[1] and the resolution we
> suggest is attached to this email: new entries have been added in the
> list respecting the alphabetical order.

Yup, that was my plan as well. Apologies for the trouble, I thought
since the conflict will only exist for a day I'd be the only one
suffering.

I think we should also sort the Makefile FWIW.
Perhaps it's better done during the merge window.

> I'm sharing this thinking it can help others but if it only creates
> noise, please tell me! :-)

> [1] https://github.com/multipath-tcp/mptcp_net-next/commit/4151695b70b6

It is useful, thanks!

Re: [PATCH] selftests: net: sort .gitignore file

[Matthieu Baerts]

Hi Jakub,

On 01/09/2022 22:05, Jakub Kicinski wrote:
> On Thu, 1 Sep 2022 12:15:02 +0200 Matthieu Baerts wrote:
>> Hello,
>>
>> On 29/08/2022 20:47, Axel Rasmussen wrote:
>>> This is the result of `sort tools/testing/selftests/net/.gitignore`, but
>>> preserving the comment at the top.  
>>
>> FYI, we got a small conflict (as expected by Jakub) when merging -net in
>> net-next in the MPTCP tree due to this patch applied in -net:
>>
>>   5a3a59981027 ("selftests: net: sort .gitignore file")
>>
>> and these ones from net-next:
>>
>>   c35ecb95c448 ("selftests/net: Add test for timing a bind request to a
>> port with a populated bhash entry")
>>   1be9ac87a75a ("selftests/net: Add sk_bind_sendto_listen and
>> sk_connect_zero_addr")
>>
>> The conflict has been resolved on our side[1] and the resolution we
>> suggest is attached to this email: new entries have been added in the
>> list respecting the alphabetical order.
> 
> Yup, that was my plan as well. Apologies for the trouble, I thought
> since the conflict will only exist for a day I'd be the only one
> suffering.

That's alright, it was not difficult to resolve :)

We do the sync everyday around 6AM UTC time:


https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/update-tg-tree.yml

If you prefer and if we have issues on a Thursday, we can also wait for
the next day before looking at these conflicts and report them.

> I think we should also sort the Makefile FWIW.
> Perhaps it's better done during the merge window.

Indeed, that would make sense to do them at this period but I also
understand such clean-up are useful to reduce conflicts later.

Such conflicts created by the clean-up are also easy to resolve so no
need to worry to much I think.

>> I'm sharing this thinking it can help others but if it only creates
>> noise, please tell me! :-)
> 
>> [1] https://github.com/multipath-tcp/mptcp_net-next/commit/4151695b70b6
> 
> It is useful, thanks!

I'm glad it is! (Sharing them is also useful for us to avoid diverging
our tree from net and net-next if the conflicts are resolved differently
:) )

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