Hi, Kalle! On 2021-08-01 at 10:25 GMT, Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > > Failed to apply to wireless-drivers-next, please rebase. > > Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c' > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: brcmfmac: use separate firmware for 43430 revision 2 > Using index info to reconstruct a base tree... > M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2 > > Patch set to Changes Requested. I've posted a rebased v3 [1]. Anything else to do for this patch? [1] https://lore.kernel.org/linux-wireless/20210804231308.576071-1-mike.rudenko@xxxxxxxxx/ -- Kind regards, Mikhail
