Subject: linux-next: manual merge of the phy-next tree with the phy tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 19 Feb 2024 14:44:23 +1100

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:

  d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")

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.

-- 
Cheers,
Stephen Rothwell

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