From: Kalle Valo <kvalo@codeaurora.org>
To: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>,
Johannes Berg <johannes@sipsolutions.net>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH V11 2/2] brcmfmac: add support for nl80211 BSS_SELECT feature
Date: Mon, 18 Apr 2016 19:13:37 +0300 [thread overview]
Message-ID: <87vb3eki8e.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <57139F97.5010106@broadcom.com> (Arend van Spriel's message of "Sun, 17 Apr 2016 16:37:11 +0200")
Arend van Spriel <arend.vanspriel@broadcom.com> writes:
> On 15-04-16 20:33, Kalle Valo wrote:
>> Arend van Spriel <arend@broadcom.com> writes:
>>
>>> Announce support for nl80211 feature BSS_SELECT and process
>>> BSS selection behaviour provided in .connect() callback.
>>>
>>> Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
>>> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
>>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>>> Reviewed-by: Lei Zhang <leizh@broadcom.com>
>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>
>> Sorry, didn't apply anymore and I don't dare to try to fix the
>> conflicts:
>>
>> Applying: brcmfmac: add support for nl80211 BSS_SELECT feature
>> Using index info to reconstruct a base tree...
>> Falling back to patching base and 3-way merge...
>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
>> CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>>
>> So please rebase.
>
> It probably never applied as I created the patch together with nl80211
> patch on mac80211-next/master branch. Not sure how to handle it
> otherwise.
Yeah, I don't see any better way to do this either and I think the way
you did is best.
> Anyway, I will send out a rebased version soon.
Got it, thanks.
--
Kalle Valo
next prev parent reply other threads:[~2016-04-18 16:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 19:37 [PATCH V11 1/2] nl80211: add feature for BSS selection support Arend van Spriel
2016-03-02 19:37 ` [PATCH V11 2/2] brcmfmac: add support for nl80211 BSS_SELECT feature Arend van Spriel
2016-03-07 12:52 ` Kalle Valo
2016-03-07 19:46 ` Arend Van Spriel
2016-04-15 18:33 ` Kalle Valo
2016-04-17 14:37 ` Arend van Spriel
2016-04-18 16:13 ` Kalle Valo [this message]
2016-04-17 14:44 ` [PATCH V11] " Arend van Spriel
2016-04-26 9:14 ` [V11] " Kalle Valo
2016-03-03 15:55 ` [PATCH V11 1/2] nl80211: add feature for BSS selection support Johannes Berg
2016-03-03 19:19 ` Arend Van Spriel
2016-03-03 21:01 ` Arend Van Spriel
2016-03-04 9:13 ` Johannes Berg
2016-03-04 14:38 ` Kalle Valo
2016-03-04 20:03 ` Arend Van Spriel
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=87vb3eki8e.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=arend.vanspriel@broadcom.com \
--cc=arend@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).