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;
Content-Type: multipart/mixed; boundary="------------RMx9DqSYj6g7kmVmU6k70eT3"
Message-ID: <fe9280ff-50b3-805a-07ef-0227cbec13e8@tessares.net>
Date:   Thu, 1 Sep 2022 12:15:02 +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:     Axel Rasmussen <axelrasmussen@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc:     netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20220829184748.1535580-1-axelrasmussen@google.com>
From:   Matthieu Baerts <matthieu.baerts@tessares.net>
In-Reply-To: <20220829184748.1535580-1-axelrasmussen@google.com>
Precedence: bulk

This is a multi-part message in MIME format.
--------------RMx9DqSYj6g7kmVmU6k70eT3
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

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
--------------RMx9DqSYj6g7kmVmU6k70eT3
Content-Type: text/x-patch; charset=UTF-8;
 name="4151695b70b6889c0be046fc6b861f4fba2efff7.patch"
Content-Disposition: attachment;
 filename="4151695b70b6889c0be046fc6b861f4fba2efff7.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWNjIHRvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL25ldC8uZ2l0aWdub3JlCmluZGV4
IGJlYzVjZjk2OTg0YyxkZTdkNWNjMTVmODUuLjNkN2FkZWU3YTNlNgotLS0gYS90b29scy90
ZXN0aW5nL3NlbGZ0ZXN0cy9uZXQvLmdpdGlnbm9yZQorKysgYi90b29scy90ZXN0aW5nL3Nl
bGZ0ZXN0cy9uZXQvLmdpdGlnbm9yZQpAQEAgLTEsNyAtMSwxNSArMSwxNiBAQEAKICAjIFNQ
RFgtTGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4wLW9ubHkKKytiaW5kX2JoYXNoCisgY21z
Z19zZW5kZXIKKyBmaW5fYWNrX2xhdAorIGdybworIGh3dHN0YW1wX2NvbmZpZworIGlvYW02
X3BhcnNlcgorIGlwX2RlZnJhZwogIGlwc2VjCisgaXB2Nl9mbG93bGFiZWwKKyBpcHY2X2Zs
b3dsYWJlbF9tZ3IKICBtc2dfemVyb2NvcHkKLSBzb2NrZXQKKyBuZXR0ZXN0CiAgcHNvY2tf
ZmFub3V0CiAgcHNvY2tfc25kCiAgcHNvY2tfdHBhY2tldApAQEAgLTExLDM1IC0yMCwyMyAr
MjEsMjUgQEBAIHJldXNlcG9ydF9icAogIHJldXNlcG9ydF9icGZfY3B1CiAgcmV1c2Vwb3J0
X2JwZl9udW1hCiAgcmV1c2Vwb3J0X2R1YWxzdGFjawotIHJldXNlYWRkcl9jb25mbGljdAot
IHRjcF9tbWFwCi0gdWRwZ3NvCi0gdWRwZ3NvX2JlbmNoX3J4Ci0gdWRwZ3NvX2JlbmNoX3R4
Ci0gdGNwX2lucQotIHRscwotIHR4cmluZ19vdmVyd3JpdGUKLSBpcF9kZWZyYWcKLSBpcHY2
X2Zsb3dsYWJlbAotIGlwdjZfZmxvd2xhYmVsX21ncgotIHNvX3R4dGltZQotIHRjcF9mYXN0
b3Blbl9iYWNrdXBfa2V5Ci0gbmV0dGVzdAotIGZpbl9hY2tfbGF0Ci0gcmV1c2VhZGRyX3Bv
cnRzX2V4aGF1c3RlZAotIGh3dHN0YW1wX2NvbmZpZwogIHJ4dGltZXN0YW1wCi0gdGltZXN0
YW1waW5nCi0gdHh0aW1lc3RhbXAKKytza19iaW5kX3NlbmR0b19saXN0ZW4KKytza19jb25u
ZWN0X3plcm9fYWRkcgorIHNvY2tldAogIHNvX25ldG5zX2Nvb2tpZQorIHNvX3R4dGltZQor
IHN0cmVzc19yZXVzZXBvcnRfbGlzdGVuCisgdGFwCisgdGNwX2Zhc3RvcGVuX2JhY2t1cF9r
ZXkKKyB0Y3BfaW5xCisgdGNwX21tYXAKICB0ZXN0X3VuaXhfb29iCi0gZ3JvCi0gaW9hbTZf
cGFyc2VyCisgdGltZXN0YW1waW5nCisgdGxzCiAgdG9lcGxpdHoKICB0dW4KLSBjbXNnX3Nl
bmRlcgorIHR4cmluZ19vdmVyd3JpdGUKKyB0eHRpbWVzdGFtcAorIHVkcGdzbworIHVkcGdz
b19iZW5jaF9yeAorIHVkcGdzb19iZW5jaF90eAogIHVuaXhfY29ubmVjdAotIHRhcAotIGJp
bmRfYmhhc2gKLSBza19iaW5kX3NlbmR0b19saXN0ZW4KLSBza19jb25uZWN0X3plcm9fYWRk
cgo=

--------------RMx9DqSYj6g7kmVmU6k70eT3--