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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: 
 <174194463076.2177919.13940583738583650186.git-patchwork-notify@kernel.org>
Date: Fri, 14 Mar 2025 09:30:30 +0000
From: patchwork-bot+netdevbpf@...nel.org
To: Matthieu Baerts (NGI0) <matttbe@...nel.org>
Cc: mptcp@...ts.linux.dev, andrew+netdev@...n.ch, davem@...emloft.net,
 edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com, shuah@...nel.org,
 netdev@...r.kernel.org, linux-kselftest@...r.kernel.org,
 linux-kernel@...r.kernel.org, sfr@...b.auug.org.au
Subject: 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@...hat.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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html