Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp522596rwe; Thu, 1 Sep 2022 03:45:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR4SOA4vbVizULgP0rbPRj/B7TGsR2TLWBtGUJE8s6InF8NczPA4wmX2yTBISZpndjNWV+p+ X-Received: by 2002:a05:6402:1cc4:b0:440:5af8:41c9 with SMTP id ds4-20020a0564021cc400b004405af841c9mr27977839edb.339.1662029108934; Thu, 01 Sep 2022 03:45:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662029108; cv=none; d=google.com; s=arc-20160816; b=oQ88Va7TEioRzCXpCZWjYxVThu7p3zngGRTq7bJvxrmPMTm8tEunQ39AnytHNKxlai I7MWNocAPCc8I8SdwovR9YJVF15MLPh/L4y3ZF25xe15vo6TAw9ECYWsTTvo+F1FN+D+ OI9pqc1gsACnq28uG4NmZ6abZtJWpZbblPR06q/xe2la28t7DTL8itTS7EDnVXUB0VMr 5loyI6h+b/EjeF6r/RwsWyuDB2684YjowufazLtIei7GH+NNTHwEHcxnsUnQ/imxiotY mKEr1cVYyB3/bBoMhvwEl0w1hkeHs03BZM3QATcD4lT1Rji26PSAxNj7UYfwli1/Jifj UJvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=epf+Q54XZk9zXGQT4gxazcQCwv6mPJH3vEMEJMYkLpQ=; b=dJ0n8PcaxGgLXlyIpI38fmZU0sXg0LZ9O1bmIgsdKlpH7teSFaq8lhRCpc7jJMfRSv e8Y/3To9SyhSGJW9aWy3BVsNVNzBnOxK7bSQP+8VuRBMj+gdIq36IINaL40+b5fMz/w2 vVu3bGlDSOa3xYkNhfwNVWjlaSOog9xnPVgpH0ZVJWrPZzA9h5DwKdjsQOES5OPu5dwu 669MTMkHxCbz+ApqOeQ9UDs/1Hmu1jXoprtTbJeGb9iBsIEtJ3mRdbHKXdXA5zS3yrVV DHopwDJkQ8bH2S5WMWzX2xda4osd2qHXjEg7stu2d7xhz5LRCkJG7RrP77ukHNL76OVo p0SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=svWAOc6q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb44-20020a170907162c00b0073fb5d40522si12227819ejc.142.2022.09.01.03.44.42; Thu, 01 Sep 2022 03:45:08 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=svWAOc6q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233812AbiIAKPR (ORCPT + 99 others); Thu, 1 Sep 2022 06:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233753AbiIAKPI (ORCPT ); Thu, 1 Sep 2022 06:15:08 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6631326D3 for ; Thu, 1 Sep 2022 03:15:05 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id se27so25908850ejb.8 for ; Thu, 01 Sep 2022 03:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc; bh=epf+Q54XZk9zXGQT4gxazcQCwv6mPJH3vEMEJMYkLpQ=; b=svWAOc6qtTPFNYvoedLJ0EIDEBYH3VtuN1KYrRdz/3ux3M262vUBk9X9A7+PD/sRBo P8KzzDb3pp0d+okHiisztAe7LJelmTgk6//R4KBTId+WZpF9yvtrYQ+lUhNcK/S4BS6H HSkja6e/5Qw8GRVwqPB+r+8/xcBZqHyiN0P7SvWyPCIRG6rZziKGJMO/DmZVXHRyncPw zrTYtyGxxl2NSyXh0b5e8CaTHgnjK2Nc+0tWWdrL3WHo2jkgHXa/6GrxzJlHjdOo3z3b Oou0im51I/7GRaOj2tr9le0YMylGFAlZdp4pDT12DEdgp+9LvmLMbvaC0b5bXcA+beRa uqqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc; bh=epf+Q54XZk9zXGQT4gxazcQCwv6mPJH3vEMEJMYkLpQ=; b=V9Toq+puhaaolZOfOAE4J9eiymn8hi9P6QUh/SHK2kbYSxJbeioGUa3CRLDTy3M+N7 JBcoq/YiNH9urpstVKFUq8mBYZnmr2kkA77m9lIAD8FX8e8Mx0hcRV+HlFD2soEsrH4Y JiuXXStn38k2Te3OPqG6WL5ghDrsb07Rh4ezP64CS15AiAYKF8fgsZUbUzfDduvMzPkU eNIDw0irBJTGtOz8KSajDtS2aoF0Ve4+Oc0kP0J9w3WXcTgxqCoUVNVDKDytWS5pyKlX loUN56unZ2eTznLZN4hin+wd6hNggAoyq8jMa6Qav/Sko39R5rVKG7NLZNqjId5wMEcz rkaA== X-Gm-Message-State: ACgBeo2HEwEMu2aza9T/2uv43F9d0Ir1+q1gEQsyGDfTyTayyuu6nC3v jSPQB9wVlKw2uzmE2mSqR4Ka+Q== X-Received: by 2002:a17:906:38f:b0:742:1f68:7058 with SMTP id b15-20020a170906038f00b007421f687058mr9223162eja.743.1662027304180; Thu, 01 Sep 2022 03:15:04 -0700 (PDT) Received: from ?IPV6:2a02:578:8593:1200:d4bf:4e1a:6131:785b? ([2a02:578:8593:1200:d4bf:4e1a:6131:785b]) by smtp.gmail.com with ESMTPSA id dy17-20020a05640231f100b0043cc66d7accsm1084568edb.36.2022.09.01.03.15.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Sep 2022 03:15:03 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------RMx9DqSYj6g7kmVmU6k70eT3" Message-ID: 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 , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan 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 In-Reply-To: <20220829184748.1535580-1-axelrasmussen@google.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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--