netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthieu Baerts <matttbe@kernel.org>
To: Phil Sutter <phil@nwl.cc>, Jakub Kicinski <kuba@kernel.org>
Cc: davem@davemloft.net, netdev@vger.kernel.org, edumazet@google.com,
	pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org,
	jv@jvosburgh.net, shuah@kernel.org, kuniyu@google.com,
	martineau@kernel.org, geliang@kernel.org, pablo@netfilter.org,
	kadlec@netfilter.org, fw@strlen.de, antonio@openvpn.net,
	sd@queasysnail.net, razor@blackwall.org, idosch@nvidia.com,
	yongwang@nvidia.com, jiri@resnulli.us, danishanwar@ti.com,
	linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev,
	netfilter-devel@vger.kernel.org, coreteam@netfilter.org
Subject: Re: [PATCH net] selftests: net: sort configs
Date: Thu, 2 Oct 2025 12:38:05 +0200	[thread overview]
Message-ID: <c9120afa-7054-4e76-9727-1cac3f027a90@kernel.org> (raw)
In-Reply-To: <aN5PYtHSdp4XIWtO@orbyte.nwl.cc>

Hi Phil, Jakub,

On 02/10/2025 12:09, Phil Sutter wrote:
> Hi,
> 
> On Wed, Oct 01, 2025 at 06:52:45PM -0700, Jakub Kicinski wrote:
>> Sort config files for networking selftests. This should help us
>> avoid merge conflicts between net and net-next. patchwork check
>> will be added to prevent new issues.
> 
> The patch does not apply to my net/main (at daa26ea63c6) for unclear
> reasons,

Same for me, but I can apply it on top of net-next.

> though I verified that it does neither add nor remove lines by:
> 
> diff -u \
>   <(sed -n 's/^-\(CONFIG_.*\)/\1/p' /tmp/sort.patch | sort) \
>   <(sed -n 's/^+\(CONFIG_.*\)/\1/p' /tmp/sort.patch | sort)

Thanks for having checked this!

>> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> 
> Acked-by: Phil Sutter <phil@nwl.cc>

Thank you for having sorted these files to reduce future conflicts
between net and net-next! (Hopefully this will not cause too much
troubles when backporting some patches to stable versions, but I guess
this should be rare here with these config files.)

Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.


  reply	other threads:[~2025-10-02 10:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-02  1:52 [PATCH net] selftests: net: sort configs Jakub Kicinski
2025-10-02 10:09 ` Phil Sutter
2025-10-02 10:38   ` Matthieu Baerts [this message]
2025-10-02 10:47 ` Florian Westphal
2025-10-02 11:19 ` Antonio Quartulli

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=c9120afa-7054-4e76-9727-1cac3f027a90@kernel.org \
    --to=matttbe@kernel.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=antonio@openvpn.net \
    --cc=coreteam@netfilter.org \
    --cc=danishanwar@ti.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=fw@strlen.de \
    --cc=geliang@kernel.org \
    --cc=horms@kernel.org \
    --cc=idosch@nvidia.com \
    --cc=jiri@resnulli.us \
    --cc=jv@jvosburgh.net \
    --cc=kadlec@netfilter.org \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=martineau@kernel.org \
    --cc=mptcp@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=pablo@netfilter.org \
    --cc=phil@nwl.cc \
    --cc=razor@blackwall.org \
    --cc=sd@queasysnail.net \
    --cc=shuah@kernel.org \
    --cc=yongwang@nvidia.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).