lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 1 Sep 2022 13:05:29 -0700
From:   Jakub Kicinski <>
To:     Matthieu Baerts <>
Cc:     Axel Rasmussen <>,
        "David S. Miller" <>,
        Eric Dumazet <>,
        Paolo Abeni <>, Shuah Khan <>,,,
Subject: Re: [PATCH] selftests: net: sort .gitignore file

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

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]

It is useful, thanks!

Powered by blists - more mailing lists