Arend van Spriel <[email protected]> writes: > Announce support for nl80211 feature BSS_SELECT and process > BSS selection behaviour provided in .connect() callback. > > Reviewed-by: Hante Meuleman <[email protected]> > Reviewed-by: Franky (Zhenhui) Lin <[email protected]> > Reviewed-by: Pieter-Paul Giesberts <[email protected]> > Reviewed-by: Lei Zhang <[email protected]> > Signed-off-by: Arend van Spriel <[email protected]>
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. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
