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

[Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>]

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

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