Received-SPF: pass (google.com: domain of linux-kernel+bounces-70695-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 19 Feb 2024 15:06:29 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel.org>, Vinod Koul
 <vkoul@kernel.org>
Cc: 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: <20240219150629.7d45ae60@canb.auug.org.au>
In-Reply-To: <20240219144423.16a76202@canb.auug.org.au>
References: <20240219144423.16a76202@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CDQpwSQ_AR+KHuUVK//8QZn";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/CDQpwSQ_AR+KHuUVK//8QZn
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> 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
>   d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")
>=20
> from the phy tree and commit:
>=20
>   52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane 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.

Actually the below ...
--=20
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 5c003988c35d,6b6994cb77d7..85253936fac3
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,27 -1328,7 +1336,23 @@@ static const struct qmp_usb_offsets qmp
  	.rx		=3D 0x1000,
  };
 =20
 +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg =3D {
- 	.lanes			=3D 1,
-=20
 +	.offsets		=3D &qmp_usb_offsets_v3,
 +
 +	.serdes_tbl		=3D ipq9574_usb3_serdes_tbl,
 +	.serdes_tbl_num		=3D ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
 +	.tx_tbl			=3D msm8996_usb3_tx_tbl,
 +	.tx_tbl_num		=3D ARRAY_SIZE(msm8996_usb3_tx_tbl),
 +	.rx_tbl			=3D ipq8074_usb3_rx_tbl,
 +	.rx_tbl_num		=3D ARRAY_SIZE(ipq8074_usb3_rx_tbl),
 +	.pcs_tbl		=3D ipq8074_usb3_pcs_tbl,
 +	.pcs_tbl_num		=3D ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
 +	.vreg_list		=3D qmp_phy_vreg_l,
 +	.num_vregs		=3D ARRAY_SIZE(qmp_phy_vreg_l),
 +	.regs			=3D qmp_v3_usb3phy_regs_layout,
 +};
 +
  static const struct qmp_phy_cfg ipq8074_usb3phy_cfg =3D {
- 	.lanes			=3D 1,
-=20
  	.offsets		=3D &qmp_usb_offsets_v3,
 =20
  	.serdes_tbl		=3D ipq8074_usb3_serdes_tbl,
@@@ -1676,9 -1361,7 +1385,7 @@@ static const struct qmp_phy_cfg ipq9574
  };
 =20
  static const struct qmp_phy_cfg msm8996_usb3phy_cfg =3D {
- 	.lanes			=3D 1,
-=20
 -	.offsets		=3D &qmp_usb_offsets_v3,
 +	.offsets		=3D &qmp_usb_offsets_v3_msm8996,
 =20
  	.serdes_tbl		=3D msm8996_usb3_serdes_tbl,
  	.serdes_tbl_num		=3D ARRAY_SIZE(msm8996_usb3_serdes_tbl),

--Sig_/CDQpwSQ_AR+KHuUVK//8QZn
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXS08UACgkQAVBC80lX
0GzHCwf/dJgek783+V4ehDgFSe7Ufdlf8AKHoDJlsZwyk3jJwFCBW3dIoehJX8cz
h8GMZgAc+NGYkFY7mw8p/QWdcVe874bBSQItXVfJUVGzamWR71U9SpscIZO7LWw1
HMxOzM5dl3QtRgafBz24BZPoPHu6plKozC9igIFuAvkkwMudBfj44bkkwgjAq1aN
sN6zoEntgbaPZbS/gaH+XxcGG/laZuwppmXhHhVCATh5BXnXITcu4sJiBchttgAS
wnbe22BAJQkNDtud9pSal5wRjEJHidA4U3ub5Lr1DAUdCQ9Cjdtky1QeiMP1+PSI
QbXMRL5q06mSx5yyltXthUWhCtnPtg==
=cEJj
-----END PGP SIGNATURE-----

--Sig_/CDQpwSQ_AR+KHuUVK//8QZn--