Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx> writes: > On 15-04-16 20:33, Kalle Valo wrote: >> Arend van Spriel <arend@xxxxxxxxxxxx> writes: >> >>> Announce support for nl80211 feature BSS_SELECT and process >>> BSS selection behaviour provided in .connect() callback. >>> >>> Reviewed-by: Hante Meuleman <meuleman@xxxxxxxxxxxx> >>> Reviewed-by: Franky (Zhenhui) Lin <frankyl@xxxxxxxxxxxx> >>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@xxxxxxxxxxxx> >>> Reviewed-by: Lei Zhang <leizh@xxxxxxxxxxxx> >>> Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx> >> >> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
