Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <695db55b-959c-0165-b35d-338ba36fa0e4@tessares.net>
Date:   Fri, 2 Sep 2022 14:03:04 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.0
Subject: Re: [PATCH] selftests: net: sort .gitignore file
Content-Language: en-GB
To:     Jakub Kicinski <kuba@kernel.org>
Cc:     Axel Rasmussen <axelrasmussen@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>,
        netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20220829184748.1535580-1-axelrasmussen@google.com>
 <fe9280ff-50b3-805a-07ef-0227cbec13e8@tessares.net>
 <20220901130529.2f364617@kernel.org>
From:   Matthieu Baerts <matthieu.baerts@tessares.net>
In-Reply-To: <20220901130529.2f364617@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

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