Wright Feng <wright.feng@xxxxxxxxxxx> wrote: > From: Kurt Lee <kurt.lee@xxxxxxxxxxx> > > Let driver parse DPP(Device Provisioning Protocol) frames from upper > layer and do corresponding configuration to firmware. > > Signed-off-by: Kurt Lee <kurt.lee@xxxxxxxxxxx> > Signed-off-by: Wright Feng <wright.feng@xxxxxxxxxxx> Failed to apply: Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c' error: Failed to merge in the changes. Applying: brcmfmac: Support DPP feature Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Patch failed at 0001 brcmfmac: Support DPP feature The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/project/linux-wireless/patch/20201012084347.121557-3-wright.feng@xxxxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
