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 <[email protected]> > > Acked-by: Phil Sutter <[email protected]> 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) <[email protected]> Cheers, Matt -- Sponsored by the NGI0 Core fund.
