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

Geert Uytterhoeven
2025-05-20T08:07:25Z

Hi Stephen,

On Thu, 15 May 2025 at 09:23, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
>
> between commit:
>
> f9475055b11c ("phy: phy-rockchip-samsung-hdptx: Fix PHY PLL output 50.25MHz error")
>
> from the phy tree and commit:
>
> 0edf9d2bb9b4 ("phy: rockchip: samsung-hdptx: Avoid Hz<->hHz unit conversion overhead")
>
> 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/rockchip/phy-rockchip-samsung-hdptx.c
> index 77236f012a1f,bb49d69a6f17..000000000000
> --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
> +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
> @@@ -444,47 -412,45 +412,47 @@@ struct rk_hdptx_phy
> };
>
> static const struct ropll_config ropll_tmds_cfg[] = {

[...]

> 1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> - { 650000, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
> + { 65000000ULL, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
> 1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> - { 502500, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,
> ++ { 50250000Ull, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,

Note that all other entries are using all-caps ULL.

> + 4, 11, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> - { 337500, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
> + { 33750000ULL, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
> 1, 1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },

[...]

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds