"brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> wrote: > The 2018 13" MacBook Pro (MacBookPro15,2) has a Broadcom chip, the 4364. > This chip appears to be specific to Apple and is not found in other > hardware. > > Add this chip to the brcmfmac driver so that it can be recognized > automatically. Note that the PCI device id is 4464 even though the chip > is referred to as the 4364. > > Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> Failed to apply to wireless-drivers-next, please rebase and resend. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c' error: Failed to merge in the changes. Applying: brcmfmac: add the BRCM 4364 found in MacBook Pro 15,2 Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c M drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c Patch failed at 0001 brcmfmac: add the BRCM 4364 found in MacBook Pro 15,2 The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/11351701/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
