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