Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [PATCH 1/5] brcmfmac: increase default max WOWL patterns to 16
From:   Kalle Valo <kvalo@kernel.org>
In-Reply-To: <20220914033102.27893-2-ian.lin@infineon.com>
References: <20220914033102.27893-2-ian.lin@infineon.com>
To:     Ian Lin <ian.lin@infineon.com>
Cc:     <linux-wireless@vger.kernel.org>,
        <brcm80211-dev-list@broadcom.com>,
        <brcm80211-dev-list@cypress.com>, <franky.lin@broadcom.com>,
        <hante.meuleman@broadcom.com>, <Double.Lo@infineon.com>,
        <ian.lin@infineon.com>
User-Agent: pwcli/0.1.1-git (https://github.com/kvalo/pwcli/) Python/3.7.3
Message-ID: <166382705512.9021.1981848395524953230.kvalo@kernel.org>
Date:   Thu, 22 Sep 2022 06:10:56 +0000 (UTC)
Precedence: bulk

Ian Lin <ian.lin@infineon.com> wrote:

> From: Ryohei Kondo <ryohei.kondo@cypress.com>
> 
> 4373 has support of 16 WOWL patterns thus increasing the default value
> 
> Signed-off-by: Ryohei Kondo <ryohei.kondo@cypress.com>
> Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
> Signed-off-by: Ian Lin <ian.lin@infineon.com>

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@infineon.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches