From: Kalle Valo <kvalo@codeaurora.org>
To: Arend Van Spriel <arend.vanspriel@broadcom.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: [V3, 5/9] brcmfmac: add firmware feature detection for gscan feature
Date: Fri, 19 May 2017 08:03:35 +0300 [thread overview]
Message-ID: <87y3tt8ml4.fsf@codeaurora.org> (raw)
In-Reply-To: <fb2b7327-39c6-dc75-e792-e255f8689754@broadcom.com> (Arend Van Spriel's message of "Thu, 18 May 2017 21:34:26 +0200")
Arend Van Spriel <arend.vanspriel@broadcom.com> writes:
> On 18-5-2017 17:47, Kalle Valo wrote:
>> Kalle Valo <kvalo@codeaurora.org> writes:
>>
>>> Arend Van Spriel <arend.vanspriel@broadcom.com> wrote:
>>>> From: Arend van Spriel <arend@broadcom.com>
>>>>
>>>> Detect gscan support in firmware by doing pfn_gscan_cfg iovar with
>>>> invalid version.
>>>>
>>>> Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
>>>> Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
>>>> Reviewed-by: Franky Lin <franky.lin@broadcom.com>
>>>> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>>>
>>> Failed to apply:
>>>
>>> fatal: sha1 information is lacking or useless
>>> (drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c).
>>> error: could not build fake ancestor
>>> Applying: brcmfmac: add support multi-scheduled scan
>>> Patch failed at 0001 brcmfmac: add support multi-scheduled scan
>>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>>>
>>> 5 patches set to Changes Requested.
>>>
>>> 9692541 [V3,5/9] brcmfmac: add firmware feature detection for gscan feature
>>> 9692537 [V3,6/9] brcmfmac: move scheduled scan wiphy param setting to pno module
>>> 9692543 [V3,7/9] brcmfmac: add support multi-scheduled scan
>>> 9692535 [V3,8/9] brcmfmac: add mutex to protect pno requests
>>> 9692539 [V3,9/9] brcmfmac: add scheduled scan support for specified BSSIDs
>>
>> Actually I made a mistake and forgot to manually remove patches 5 and 6
>> from the tree after the conflict (I haven't automated that part yet in
>> my script). So these are now applied:
>>
>> 9fe929aaace6 brcmfmac: add firmware feature detection for gscan feature
>> 94ed6ffb7965 brcmfmac: move scheduled scan wiphy param setting to pno module
>>
>> Please resend patches 7-9 and double check that the tree looks ok :)
>
> Will do. These patches were in same series as cfg80211 changes and all
> based on mac80211-next/master. I already mentioned to you and Johannes
> in earlier version of the patch series (posted April 7) that this would
> result in a merge conflict, but I can imagine that info got lost after
> more than a month.
Ah, I remember now. But yeah, too many emails so I tend to forget so old
discussions while looking at patches.
--
Kalle Valo
next prev parent reply other threads:[~2017-05-19 5:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 12:04 [PATCH V3 0/9] cfg80211: support multiple scheduled scans Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 1/9] nl80211: allow multiple active scheduled scan requests Arend van Spriel
2017-04-25 19:49 ` Johannes Berg
2017-04-26 6:50 ` Johannes Berg
2017-04-26 8:46 ` Arend van Spriel
2017-04-26 8:49 ` Johannes Berg
2017-04-26 9:05 ` Arend van Spriel
2017-04-26 9:08 ` Johannes Berg
2017-04-26 10:24 ` Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 2/9] nl80211: add support for BSSIDs in scheduled scan matchsets Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 3/9] cfg80211: add request id parameter to .sched_scan_stop() signature Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 4/9] cfg80211: add request id to cfg80211_sched_scan_*() api Arend van Spriel
2017-04-26 7:16 ` Johannes Berg
2017-04-26 18:18 ` Arend Van Spriel
2017-04-26 18:47 ` Johannes Berg
2017-04-21 12:05 ` [PATCH V3 5/9] brcmfmac: add firmware feature detection for gscan feature Arend van Spriel
2017-05-18 13:36 ` [V3, " Kalle Valo
2017-05-18 15:47 ` Kalle Valo
2017-05-18 19:34 ` Arend Van Spriel
2017-05-19 5:03 ` Kalle Valo [this message]
2017-04-21 12:05 ` [PATCH V3 6/9] brcmfmac: move scheduled scan wiphy param setting to pno module Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 7/9] brcmfmac: add support multi-scheduled scan Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 8/9] brcmfmac: add mutex to protect pno requests Arend van Spriel
2017-04-21 12:05 ` [PATCH V3 9/9] brcmfmac: add scheduled scan support for specified BSSIDs Arend van Spriel
2017-04-26 7:07 ` [PATCH V3 0/9] cfg80211: support multiple scheduled scans Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3tt8ml4.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=arend.vanspriel@broadcom.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).