netdev - Re: [PATCH net 0/7] netfilter: updates for net: manual merge

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: <04fa441a-0171-4569-8764-1cfad39b8386@kernel.org>
Date: Thu, 11 Sep 2025 09:16:40 +0200
From: Matthieu Baerts <matttbe@...nel.org>
To: Florian Westphal <fw@...len.de>, netdev@...r.kernel.org
Cc: Paolo Abeni <pabeni@...hat.com>, "David S. Miller" <davem@...emloft.net>,
 Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
 netfilter-devel@...r.kernel.org, pablo@...filter.org,
 Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH net 0/7] netfilter: updates for net: manual merge

Hi Florian,

On 10/09/2025 21:03, Florian Westphal wrote:
> Hi,
> 
> The following patchset contains Netfilter fixes for *net*:
> 
> WARNING: This results in a conflict on net -> net-next merge.
> Merge resolution walkthrough is at the end of this cover letter, see
> MERGE WALKTHROUGH.

Thank you for these instructions, that was very clear!

Just in case other people need that, attached is the corresponding 3-way
patch, and the rr-cache for this conflict is available there:

https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/580515b

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

View attachment "4cab275179a48c3ded528b85c4daed7808a6f04c.patch" of type "text/x-patch" (3167 bytes)