Received-SPF: pass (google.com: domain of linux-kernel+bounces-37853-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: Thu, 25 Jan 2024 12:33:27 +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>, Mantas Pucka <mantas@8devices.com>
Subject: linux-next: manual merge of the phy-next tree with the phy tree
Message-ID: <20240125123327.4e2825ab@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/P.9/+PAaV=dIUGYBEyvUrXX";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/P.9/+PAaV=dIUGYBEyvUrXX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-qmp-usb.c

between commit:

  f74c35b630d4 ("phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq601=
8")

from the phy tree and commit:

  52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 6621246e4ddf,e62539ce99a6..25d8d881b2f3
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,28 -1385,8 +1393,24 @@@ 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_ipq8074,
 +
 +	.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,
 +	.offsets		=3D &qmp_usb_offsets_ipq8074,
 =20
  	.serdes_tbl		=3D ipq8074_usb3_serdes_tbl,
  	.serdes_tbl_num		=3D ARRAY_SIZE(ipq8074_usb3_serdes_tbl),

--Sig_/P.9/+PAaV=dIUGYBEyvUrXX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWxumcACgkQAVBC80lX
0GyAxQf/b9N4//QzimAOUh3oYTiKCCjP6pgi7X8jxOIr6+9zMlfQMNjOnGSlLUb5
5M7dk5m/II92euWE2sfxnmyaRuCJDsW1Y+nzCMUg73ClZb5kcx+hdYOx1xNkb97q
Lkj7wCg6rvJDJZvtA6y30l4l8L1CYW8QBsEXpn21GezNaCYvGkkjpnvgYaWc/2jX
t0W9RMpQNeNTI97sWRSWLq4ZdW2lYNmpg7xRBwYI/3KvmlPT4Dih9pV/nV+gM6uM
nrjC4+kZ/dFHYSd5pnYL4X/xaPoAmPDxWE0M7bcO4UUdOCNqMFktkdhtDoOxbFDS
uVzAoqQu4skcPV25x0zqE/nJhPXt0Q==
=xuwC
-----END PGP SIGNATURE-----

--Sig_/P.9/+PAaV=dIUGYBEyvUrXX--