Re: [PATCHv3 net 2/2] selftests: bonding: add ipsec offload test: manual merge

On Wed, Oct 01, 2025 at 10:37:51AM +0200, Matthieu Baerts wrote:

Note: A way to reduce such conflicts in the future is to sort each entry by alphabetical order instead of adding new ones at the end. Same in the 'config' file that is also modified in this patch.

Thanks for the suggestion. I will update Makefile and config to use alphabet order next time.

Regards Hangbin