Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx> wrote: > Add support for BCM43596 dual-band AC chip, found in > SONY Xperia X Performance, XZ and XZs smartphones (and > *possibly* other devices from other manufacturers). > The chip doesn't require any special handling and seems to work > just fine OOTB. > > PCIe IDs taken from: https://github.com/sonyxperiadev/kernel/commit/9e43fefbac8e43c3d7792e73ca52a052dd86d7e3.patch > > Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx> Failed to apply, please rebase on top of wireless-drivers-next and resend as v2. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Applying: brcmfmac: Add support for BCM43596 PCIe Wi-Fi 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 M drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h 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 support for BCM43596 PCIe Wi-Fi Patch set to Changes Requested. -- https://patchwork.kernel.org/project/linux-wireless/patch/20210307113550.7720-1-konrad.dybcio@xxxxxxxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
