Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Mon, 25 Sep 2023 13:24:54 +1000
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
Message-ID: <20230925132454.7210eaef@canb.auug.org.au>
In-Reply-To: <20230925131607.7a71254f@canb.auug.org.au>
References: <20230925131607.7a71254f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5cX9selYLN_OV5vP5E_whei";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/5cX9selYLN_OV5vP5E_whei
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:
>=20
>   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
>=20
> between commit:
>=20
>   c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp=
 and sa8775p")
>=20
> from the phy tree and commits:
>=20
>   7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
>   fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset handling")
>=20
> from the phy-next tree.
>=20
> 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.

--=20
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		=3D ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		=3D sa8775p_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		=3D ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		=3D sa8775p_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	=3D ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_usb_tbl),
- 	.clk_list		=3D qmp_v4_phy_clk_l,
- 	.num_clks		=3D ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		=3D qcm2290_usb3phy_reset_l,
- 	.num_resets		=3D ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		=3D qmp_phy_vreg_l,
  	.num_vregs		=3D ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			=3D qmp_v5_usb3phy_regs_layout,
@@@ -1413,12 -1396,6 +1404,8 @@@ static const struct qmp_phy_cfg sc8280x
  	.rx_tbl_num		=3D ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		=3D sc8280xp_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		=3D ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		=3D sc8280xp_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	=3D ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_usb_tbl),
- 	.clk_list		=3D qmp_v4_phy_clk_l,
- 	.num_clks		=3D ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		=3D qcm2290_usb3phy_reset_l,
- 	.num_resets		=3D ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		=3D qmp_phy_vreg_l,
  	.num_vregs		=3D ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			=3D qmp_v5_usb3phy_regs_layout,

--Sig_/5cX9selYLN_OV5vP5E_whei
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUQ/YYACgkQAVBC80lX
0Gxmugf/aTg8RY8mnjdUW22UG5rC4SB9jdA5LdBqGPYdkQ588fPFAUO3ccV7WCLI
c/Se84rEdfdEO4O9u8uzMeRAAjZjggyb1+JSd+JnzR6IDri64xUkMWqmUV+45p80
+oZSJUuqzFD02zjtTY96bPi+NaFTa2NG3Zx5nuS54Xtl8MNam3PEbjuEg/BE5yvA
iEWgWu40Ijm5hrFxoE80QP5x/32XZuSEw7HwAObMTvsM7nat7n39D5I8XpAcrU1b
gqIhQOe5kowuxkirKtNzSAY0Xc7+lvyDQwciLpEYe9lQE4TAiYErAE2WRHicgdAb
Fql8RnOVNPDMnIwXNUHKy0GX4uWt8A==
=IKbW
-----END PGP SIGNATURE-----

--Sig_/5cX9selYLN_OV5vP5E_whei--