netdev - Re: pull-request: wireless-next-2022-03-11

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: <20220311130530.70d9faa6@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Fri, 11 Mar 2022 13:05:30 -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: wireless-next-2022-03-11

On Fri, 11 Mar 2022 13:40:28 +0100 Johannes Berg wrote:
> Hi,
> 
> Here's another (almost certainly final for 5.8) set of
> patches for net-next.

5.18 ;)

> Note that there's a minor merge conflict - Stephen already
> noticed it and resolved it here:
> https://lore.kernel.org/linux-wireless/20220217110903.7f58acae@canb.auug.org.au/
> 
> I didn't resolve it explicitly by merging back since it's
> such a simple conflict, but let me know if you want me to
> do that (now or in the future).

Looks like commit e8e10a37c51c ("iwlwifi: acpi: move ppag code from mvm
to fw/acpi") uses spaces for indentation?