Wright Feng <[email protected]> wrote: > From: Chung-Hsien Hsu <[email protected]> > > The firmware for brcmfmac devices includes information regarding > regulatory constraints. For certain devices this information is kept > separately in a binary form that needs to be downloaded to the device. > This patch adds support to download this so-called CLM blob file. It > uses the same naming scheme as the other firmware files with extension > of .clm_blob. > > The CLM blob file is optional. If the file does not exist, the download > process will be bypassed. It will not affect the driver loading. > > Signed-off-by: Chung-Hsien Hsu <[email protected]> > Reviewed-by: Arend van Spriel <[email protected]>
Didn't apply: error: Failed to merge in the changes. Applying: brcmfmac: add CLM download support Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h M drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h M drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h M drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Patch failed at 0001 brcmfmac: add CLM download support The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/9986493/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
