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
| ||
|
Date: Mon, 13 Mar 2023 09:04:33 +0100
From: Matthieu Baerts <matthieu.baerts@...sares.net>
To: Johannes Berg <johannes@...solutions.net>
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
Stephen Rothwell <sfr@...b.auug.org.au>,
Jakub Kicinski <kuba@...nel.org>
Subject: Re: pull-request: wireless-2023-03-10: manual merge
Hi Johannes,
(+cc Jakub and Stephen)
On 10/03/2023 12:46, Johannes Berg wrote:
> Hi,
>
> For now in wireless we only have a few fixes for some
> recently reported (and mostly recently introduced)
> problems.
(...)
> Johannes Berg (4):
> wifi: nl80211: fix NULL-ptr deref in offchan check
> wifi: nl80211: fix puncturing bitmap policy
FYI, we got a small conflict when merging -net in net-next in the MPTCP
tree due to this patch applied in -net:
b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
and this one from net-next:
cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW
timestamping")
The conflict has been resolved on our side[1] by keeping the
modifications from both sides and the resolution we suggest is attached
to this email.
Cheers,
Matt
[1] https://github.com/multipath-tcp/mptcp_net-next/commit/a95a213e49af
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
View attachment "a95a213e49afeb23fc8f6ce561366886e31b5692.patch" of type "text/x-patch" (730 bytes)
Powered by blists - more mailing lists