From: Jakub Kicinski <kuba@kernel.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
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
Subject: Re: [PATCH] selftests: net: sort .gitignore file
Date: Thu, 1 Sep 2022 13:05:29 -0700 [thread overview]
Message-ID: <20220901130529.2f364617@kernel.org> (raw)
In-Reply-To: <fe9280ff-50b3-805a-07ef-0227cbec13e8@tessares.net>
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.
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] https://github.com/multipath-tcp/mptcp_net-next/commit/4151695b70b6
It is useful, thanks!
next prev parent reply other threads:[~2022-09-01 20:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 18:47 [PATCH] selftests: net: sort .gitignore file Axel Rasmussen
2022-08-31 19:50 ` patchwork-bot+netdevbpf
2022-09-01 10:15 ` Matthieu Baerts
2022-09-01 20:05 ` Jakub Kicinski [this message]
2022-09-02 12:03 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220901130529.2f364617@kernel.org \
--to=kuba@kernel.org \
--cc=axelrasmussen@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.