Chi-Hsien Lin <[email protected]> wrote: > From: Chung-Hsien Hsu <[email protected]> > > The firmware may have SAE authentication code built-in. This is > detected by the driver and indicated in the wiphy features flags. > User-space can use this flag to determine whether or not to provide > the password material for SAE authentication in the nl80211 CONNECT > command. > > Signed-off-by: Chung-Hsien Hsu <[email protected]> > Signed-off-by: Chi-Hsien Lin <[email protected]>
Failed to apply, please rebase and resend. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c' Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h' error: Failed to merge in the changes. Applying: brcmfmac: add support for SAE authentication offload Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h M drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h M drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h M drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Patch failed at 0001 brcmfmac: add support for SAE authentication offload The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/10936953/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
