netdev - Re: pull-request: mac80211-next 2021-12-21

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]

Message-ID: <20211221080700.3554579d@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Tue, 21 Dec 2021 08:07:00 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Johannes Berg <johannes@...solutions.net>
Cc:     netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: mac80211-next 2021-12-21

On Tue, 21 Dec 2021 12:25:31 +0100 Johannes Berg wrote:
> We have a couple more changes in the wireless stack,
> and in part I'm asking you to pull them in order to
> fix linux-next.
> 
> Note that there are two merge conflicts with net-next:
> 
>  1) There's a merge conflict in net/wireless/reg.c,
>     which is pretty simple, but you can see a sample
>     resolution from Stephen here:
>     https://lore.kernel.org/r/20211221111950.57ecc6a7@canb.auug.org.au
> 
>  2) There's an API change in mac80211-next that affects
>     code I didn't yet have, a change for ath10k is needed,
>     again from Stephen we have a sample here:
>     https://lore.kernel.org/r/20211221115004.1cd6b262@canb.auug.org.au
> 
> If you prefer I pull back net-next and fix these first,
> I can do that as well, just let me know.

Thanks for the links, pulled.

> Please pull and let me know if there's any (further) problem.

There was one faulty Fixes tag in there, FWIW.