netdev - Re: pull-request: wireless-2023-03-10: 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 for Android: free password hash cracker in your pocket

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

Date:   Mon, 13 Mar 2023 10:13:41 +0100
From:   Johannes Berg <johannes@...solutions.net>
To:     Matthieu Baerts <matthieu.baerts@...sares.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

On Mon, 2023-03-13 at 09:04 +0100, Matthieu Baerts wrote:
> 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")
> 

Right, overlapping changes/additions.

I suspect there isn't much I can do about it at this point, other than
merging wireless into wireless-next and then sending a pull request for
that, but that seems a bit pointless?

Jakub, any preferences?

johannes