From: Kalle Valo <kvalo@codeaurora.org>
To: Konrad Dybcio <konrad.dybcio@somainline.org>
Cc: phone-devel@vger.kernel.org,
~postmarketos/upstreaming@lists.sr.ht,
martin.botka@somainline.org,
angelogioacchino.delregno@somainline.org,
marijn.suijten@somainline.org,
"Konrad Dybcio" <konrad.dybcio@somainline.org>,
"Arend van Spriel" <aspriel@gmail.com>,
"Franky Lin" <franky.lin@broadcom.com>,
"Hante Meuleman" <hante.meuleman@broadcom.com>,
"Chi-hsien Lin" <chi-hsien.lin@infineon.com>,
"Wright Feng" <wright.feng@infineon.com>,
"Chung-hsien Hsu" <chung-hsien.hsu@infineon.com>,
"David S. Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Rafał Miłecki" <rafal@milecki.pl>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
"Lee Jones" <lee.jones@linaro.org>,
"Seung-Woo Kim" <sw0312.kim@samsung.com>,
linux-wireless@vger.kernel.org,
brcm80211-dev-list.pdl@broadcom.com,
SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] brcmfmac: Add support for BCM43596 PCIe Wi-Fi
Date: Mon, 11 Oct 2021 06:04:42 +0000 (UTC) [thread overview]
Message-ID: <163393227439.11913.16736072075122117569.kvalo@codeaurora.org> (raw)
In-Reply-To: <20210307113550.7720-1-konrad.dybcio@somainline.org>
Konrad Dybcio <konrad.dybcio@somainline.org> 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@somainline.org>
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@somainline.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2021-10-11 6:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-07 11:35 [PATCH] brcmfmac: Add support for BCM43596 PCIe Wi-Fi Konrad Dybcio
2021-04-12 8:36 ` Arend van Spriel
2021-04-12 10:39 ` AngeloGioacchino Del Regno
2021-05-20 19:20 ` Konrad Dybcio
2021-10-11 6:04 ` Kalle Valo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163393227439.11913.16736072075122117569.kvalo@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=SHA-cyfmac-dev-list@infineon.com \
--cc=angelogioacchino.delregno@somainline.org \
--cc=aspriel@gmail.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=chi-hsien.lin@infineon.com \
--cc=chung-hsien.hsu@infineon.com \
--cc=davem@davemloft.net \
--cc=franky.lin@broadcom.com \
--cc=gustavoars@kernel.org \
--cc=hante.meuleman@broadcom.com \
--cc=konrad.dybcio@somainline.org \
--cc=kuba@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=martin.botka@somainline.org \
--cc=netdev@vger.kernel.org \
--cc=phone-devel@vger.kernel.org \
--cc=rafal@milecki.pl \
--cc=sw0312.kim@samsung.com \
--cc=wright.feng@infineon.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).