linux-kernel - Re: [PATCH v11 1/4] dt-bindings: net: wireless: brcm4329-fmac: add pci14e4,449d

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <172431718274.2217900.9766315386587933045.kvalo@kernel.org>
Date: Thu, 22 Aug 2024 08:59:44 +0000 (UTC)
From: Kalle Valo <kvalo@...nel.org>
To: Jacobe Zang <jacobe.zang@...ion.com>
Cc: arend.vanspriel@...adcom.com, davem@...emloft.net, edumazet@...gle.com,
 kuba@...nel.org, pabeni@...hat.com, robh@...nel.org, krzk+dt@...nel.org,
 conor+dt@...nel.org, saikrishnag@...vell.com, megi@....cz,
 bhelgaas@...gle.com, duoming@....edu.cn, minipli@...ecurity.net,
 yajun.deng@...ux.dev, stern@...land.harvard.edu, gregkh@...uxfoundation.org,
 christophe.jaillet@...adoo.fr, linux-wireless@...r.kernel.org,
 netdev@...r.kernel.org, devicetree@...r.kernel.org,
 linux-kernel@...r.kernel.org, brcm80211@...ts.linux.dev,
 brcm80211-dev-list.pdl@...adcom.com, Jacobe Zang <jacobe.zang@...ion.com>,
 Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
Subject: Re: [PATCH v11 1/4] dt-bindings: net: wireless: brcm4329-fmac: add
 pci14e4,449d

Jacobe Zang <jacobe.zang@...ion.com> wrote:

> It's the device id used by AP6275P which is the Wi-Fi module
> used by Rockchip's RK3588 evaluation board and also used in
> some other RK3588 boards.
> 
> Acked-by: Arend van Spriel <arend.vanspriel@...adcom.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
> Signed-off-by: Jacobe Zang <jacobe.zang@...ion.com>

Fails to apply, please rebase on top of wireless-next.

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c'
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=diff' to see the failed patch
Applying: wifi: brcmfmac: Add optional lpo clock enable support
Using index info to reconstruct a base tree...
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
Patch failed at 0001 wifi: brcmfmac: Add optional lpo clock enable support

4 patches set to Changes Requested.

13765357 [v11,1/4] dt-bindings: net: wireless: brcm4329-fmac: add pci14e4,449d
13765358 [v11,2/4] dt-bindings: net: wireless: brcm4329-fmac: add clock description for AP6275P
13765359 [v11,3/4] wifi: brcmfmac: Add optional lpo clock enable support
13765360 [v11,4/4] wifi: brcmfmac: add flag for random seed during firmware download

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20240816020635.1273911-2-jacobe.zang@wesion.com/

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