[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <c9120afa-7054-4e76-9727-1cac3f027a90@kernel.org>
Date: Thu, 2 Oct 2025 12:38:05 +0200
From: Matthieu Baerts <matttbe@...nel.org>
To: Phil Sutter <phil@....cc>, Jakub Kicinski <kuba@...nel.org>
Cc: davem@...emloft.net, netdev@...r.kernel.org, edumazet@...gle.com,
pabeni@...hat.com, andrew+netdev@...n.ch, horms@...nel.org,
jv@...sburgh.net, shuah@...nel.org, kuniyu@...gle.com, martineau@...nel.org,
geliang@...nel.org, pablo@...filter.org, kadlec@...filter.org, fw@...len.de,
antonio@...nvpn.net, sd@...asysnail.net, razor@...ckwall.org,
idosch@...dia.com, yongwang@...dia.com, jiri@...nulli.us,
danishanwar@...com, linux-kselftest@...r.kernel.org, mptcp@...ts.linux.dev,
netfilter-devel@...r.kernel.org, coreteam@...filter.org
Subject: Re: [PATCH net] selftests: net: sort configs
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@...nel.org>
>
> Acked-by: Phil Sutter <phil@....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@...nel.org>
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
Powered by blists - more mailing lists