Ian Lin <ian.lin@xxxxxxxxxxxx> wrote: > From: Ryohei Kondo <ryohei.kondo@xxxxxxxxxxx> > > 4373 has support of 16 WOWL patterns thus increasing the default value > > Signed-off-by: Ryohei Kondo <ryohei.kondo@xxxxxxxxxxx> > Signed-off-by: Chi-hsien Lin <chi-hsien.lin@xxxxxxxxxxx> > Signed-off-by: Ian Lin <ian.lin@xxxxxxxxxxxx> Failed to apply, please rebase on top of latest wireless-next. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c' Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c' Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Applying: brcmfmac: Support 89459 pcie 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 CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c CONFLICT (content): Merge conflict in 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: Support 89459 pcie 5 patches set to Changes Requested. 12975535 [1/5] brcmfmac: increase default max WOWL patterns to 16 12975536 [2/5] brcmfmac: Support 89459 pcie 12975537 [3/5] brcmfmac: increase dcmd maximum buffer size 12975539 [4/5] brcmfmac: add 54591 PCIE device 12975538 [5/5] brcmfmac: Remove the call to "dtim_assoc" IOVAR -- https://patchwork.kernel.org/project/linux-wireless/patch/20220914033102.27893-2-ian.lin@xxxxxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
