From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel•org>,
Vinod Koul <vkoul@kernel•org>
Cc: Adrien Thierry <athierry@redhat•com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the phy tree
Date: Mon, 25 Sep 2023 13:24:54 +1000 [thread overview]
Message-ID: <20230925132454.7210eaef@canb.auug.org.au> (raw)
In-Reply-To: <20230925131607.7a71254f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2522 bytes --]
Hi all,
On Mon, 25 Sep 2023 13:16:07 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> drivers/phy/qualcomm/phy-qcom-qmp-usb.c
>
> between commit:
>
> c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p")
>
> from the phy tree and commits:
>
> 7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
> fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset handling")
>
> from the phy-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
--
Cheers,
Stephen Rothwell
Actually the resolution is this:
diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index c69577601ae0,2a094f2345f0..02f156298e77
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1389,12 -1378,6 +1384,8 @@@ static const struct qmp_phy_cfg sa8775p
.rx_tbl_num = ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
.pcs_tbl = sa8775p_usb3_uniphy_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),
+ .pcs_usb_tbl = sa8775p_usb3_uniphy_pcs_usb_tbl,
+ .pcs_usb_tbl_num = ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_usb_tbl),
- .clk_list = qmp_v4_phy_clk_l,
- .num_clks = ARRAY_SIZE(qmp_v4_phy_clk_l),
- .reset_list = qcm2290_usb3phy_reset_l,
- .num_resets = ARRAY_SIZE(qcm2290_usb3phy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.regs = qmp_v5_usb3phy_regs_layout,
@@@ -1413,12 -1396,6 +1404,8 @@@ static const struct qmp_phy_cfg sc8280x
.rx_tbl_num = ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
.pcs_tbl = sc8280xp_usb3_uniphy_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),
+ .pcs_usb_tbl = sc8280xp_usb3_uniphy_pcs_usb_tbl,
+ .pcs_usb_tbl_num = ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_usb_tbl),
- .clk_list = qmp_v4_phy_clk_l,
- .num_clks = ARRAY_SIZE(qmp_v4_phy_clk_l),
- .reset_list = qcm2290_usb3phy_reset_l,
- .num_resets = ARRAY_SIZE(qcm2290_usb3phy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.regs = qmp_v5_usb3phy_regs_layout,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-09-25 3:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 3:16 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2023-09-25 3:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 3:59 Stephen Rothwell
2025-05-15 7:14 Stephen Rothwell
2025-05-20 8:07 ` Geert Uytterhoeven
2025-05-15 7:09 Stephen Rothwell
2025-05-15 9:11 ` Prabhakar Mahadev Lad
2025-05-15 10:38 ` Vinod Koul
2025-05-15 10:38 ` Vinod Koul
2024-10-23 3:15 Stephen Rothwell
2024-02-19 3:44 Stephen Rothwell
2024-02-19 4:06 ` Stephen Rothwell
2024-02-19 6:13 ` Vinod Koul
2024-01-25 1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2023-09-25 3:10 Stephen Rothwell
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=20230925132454.7210eaef@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=athierry@redhat$(echo .)com \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=kishon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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