Re: [PATCH net-next] selftests: drv-net: fix merge conflicts resolution

Hello:

This patch was applied to netdev/net-next.git (main) by Paolo Abeni pabeni@redhat.com:

On Fri, 14 Mar 2025 09:35:51 +0100 you wrote:

After the recent merge between net-next and net, I got some conflicts on my side because the merge resolution was different from Stephen's one [1] I applied on my side in the MPTCP tree.

It looks like the code that is now in net-next is using the old way to retrieve the local and remote addresses. This patch is now using the new way, like what was in Stephen's email [1].

[...]

Here is the summary with links: - [net-next] selftests: drv-net: fix merge conflicts resolution https://git.kernel.org/netdev/net-next/c/a1e36ec36356

You are awesome, thank you!