From: Hangbin Liu <liuhangbin@gmail.com>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: netdev@vger.kernel.org, Jay Vosburgh <jv@jvosburgh.net>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>, Shuah Khan <shuah@kernel.org>,
Petr Machata <petrm@nvidia.com>,
linux-kselftest@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Mark Brown <broonie@kernel.org>
Subject: Re: [PATCHv3 net 2/2] selftests: bonding: add ipsec offload test: manual merge
Date: Thu, 2 Oct 2025 01:20:46 +0000 [thread overview]
Message-ID: <aN3TbpJ0nOg_VkKn@fedora> (raw)
In-Reply-To: <f4f61cb1-a2f5-4105-b051-0b16427fb12b@kernel.org>
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
next prev parent reply other threads:[~2025-10-02 1:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 2:33 [PATCHv3 net 1/2] bonding: fix xfrm offload feature setup on active-backup mode Hangbin Liu
2025-09-25 2:33 ` [PATCHv3 net 2/2] selftests: bonding: add ipsec offload test Hangbin Liu
2025-10-01 8:37 ` [PATCHv3 net 2/2] selftests: bonding: add ipsec offload test: manual merge Matthieu Baerts
2025-10-02 1:20 ` Hangbin Liu [this message]
2025-09-30 8:20 ` [PATCHv3 net 1/2] bonding: fix xfrm offload feature setup on active-backup mode patchwork-bot+netdevbpf
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=aN3TbpJ0nOg_VkKn@fedora \
--to=liuhangbin@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jv@jvosburgh.net \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=matttbe@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=sfr@canb.auug.org.au \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox