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@xxxxxxxxxxxxxxxx/ > > 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?