netdev - Re: [GIT PULL] wireless-2025-11-05: 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: <fe1a6f17-e26e-4414-8880-3f3137470849@kernel.org>
Date: Thu, 6 Nov 2025 13:37:38 +0100
From: Matthieu Baerts <matttbe@...nel.org>
To: Johannes Berg <johannes@...solutions.net>
Cc: netdev@...r.kernel.org, linux-wireless@...r.kernel.org,
 Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Subject: Re: [GIT PULL] wireless-2025-11-05: manual merge

Hi Johannes,

On 06/11/2025 10:03, Johannes Berg wrote:
> Unrelated to that: I forgot to mention that there's a conflict now
> between net and net-next, which had been reported before between ath and
> ath-next and then wireless and wireless-next, but it's just a simple
> variable addition overlap:
> 
> https://lore.kernel.org/all/20251030113037.1932c6d2@canb.auug.org.au/

Thank you for the pointer!

Just in case someone else has this conflict, you can use the rr-cache
files from:

 https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/56cf8ff

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

View attachment "cb34617c2d3ea4f78cfc0768bc4c8d1f00754f00.patch" of type "text/x-patch" (538 bytes)