From: Geert Uytterhoeven <geert@linux-m68k•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@kernel•org>,
Vinod Koul <vkoul@kernel•org>,
Algea Cao <algea.cao@rock-chips•com>,
Cristian Ciocaltea <cristian.ciocaltea@collabora•com>,
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
Date: Tue, 20 May 2025 10:07:10 +0200 [thread overview]
Message-ID: <CAMuHMdVMf3+Q2N5yXgf23LPSQPuogA3R66_W0WGWVgJRRh-ZcA@mail.gmail.com> (raw)
In-Reply-To: <20250515171420.7c6a4e4b@canb.auug.org.au>
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
next prev parent reply other threads:[~2025-05-20 8:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-15 7:14 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2025-05-20 8:07 ` Geert Uytterhoeven [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 3:59 Stephen Rothwell
2025-05-15 7:09 Stephen Rothwell
2025-05-15 9:11 ` Prabhakar Mahadev Lad
2025-05-15 10:38 ` Vinod Koul
2025-05-15 10:38 ` Vinod Koul
2024-10-23 3:15 Stephen Rothwell
2024-02-19 3:44 Stephen Rothwell
2024-02-19 4:06 ` Stephen Rothwell
2024-02-19 6:13 ` Vinod Koul
2024-01-25 1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2023-09-25 3:16 Stephen Rothwell
2023-09-25 3:24 ` Stephen Rothwell
2023-09-25 3:10 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMuHMdVMf3+Q2N5yXgf23LPSQPuogA3R66_W0WGWVgJRRh-ZcA@mail.gmail.com \
--to=geert@linux-m68k$(echo .)org \
--cc=algea.cao@rock-chips$(echo .)com \
--cc=cristian.ciocaltea@collabora$(echo .)com \
--cc=kishon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox