[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <87wngwwg4i.fsf@tynnyri.adurom.net>
Date: Mon, 14 Mar 2022 20:20:13 +0200
From: Kalle Valo <kvalo@...nel.org>
To: Jakub Kicinski <kuba@...nel.org>,
Luca Coelho <luciano.coelho@...el.com>
Cc: Johannes Berg <johannes@...solutions.net>, netdev@...r.kernel.org,
linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-next-2022-03-11
Jakub Kicinski <kuba@...nel.org> writes:
> 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?
Luca, can you check that, please?
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Powered by blists - more mailing lists