netdev - Re: pull-request: wireless-2023-10-24

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] [thread-next>] [day] [month] [year] [list]

Date: Tue, 24 Oct 2023 22:25:18 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Jakub Kicinski <kuba@...nel.org>
Cc: netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-2023-10-24

Thanks Jakub.

> > Note that this introduces a merge conflict with -next,
> > which Stephen reported and (correctly) resolved here:
> > https://lore.kernel.org/linux-wireless/20231024112424.7de86457@canb.auug.org.au/
> > Basically just context - use the ieee80211_is_protected_dual_of_public_action()
> > check from this pull request, and the return code
> > RX_DROP_U_UNPROT_UNICAST_PUB_ACTION from -next.

Are you planning to merge net into net-next really soon for some reason?

If not, I can resolve this conflict and we'll include it in the next
(and last) wireless-next pull request, which will be going out Thursday
morning (Europe time.)

johannes