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

From: Vinod Koul <vkoul@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>,
	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: Re: linux-next: manual merge of the phy-next tree with the phy tree
Date: Thu, 25 Jan 2024 17:11:35 +0530	[thread overview]
Message-ID: <ZbJI7437Hd22EuF3@matsya> (raw)
In-Reply-To: <20240125123327.4e2825ab@canb.auug.org.au>

On 25-01-24, 12:33, Stephen Rothwell wrote:
> 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/ipq6018")
> 
> 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.

Thanks Stephen, this looks good to me. I will notify Linus when he pulls
this

BR

> 
> -- 
> 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		= 0x1000,
>   };
>   
>  +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
> - 	.lanes			= 1,
> - 
>  +	.offsets		= &qmp_usb_offsets_ipq8074,
>  +
>  +	.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,
>  +	.offsets		= &qmp_usb_offsets_ipq8074,
>   
>   	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
>   	.serdes_tbl_num		= ARRAY_SIZE(ipq8074_usb3_serdes_tbl),

-- 
~Vinod