Hi Stephen,
On Tue, Mar 15, 2022 at 6:45 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/phy/freescale/Kconfig
>
> between commit:
>
> 8f73b37cf3fb ("phy: add support for the Layerscape SerDes 28G")
>
> from the net-next tree and commit:
>
> 3d565bd6fbbb ("phy: freescale: i.MX8 PHYs should depend on ARCH_MXC && ARM64")
>
> from the char-misc tree.
>
> I fixed it up (I think, 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.
> --- a/drivers/phy/freescale/Kconfig
> +++ b/drivers/phy/freescale/Kconfig
> @@@ -23,12 -26,4 +26,14 @@@ config PHY_FSL_IMX8M_PCI
> Enable this to add support for the PCIE PHY as found on
> i.MX8M family of SOCs.
>
> +config PHY_FSL_LYNX_28G
> + tristate "Freescale Layerscape Lynx 28G SerDes PHY support"
> + depends on OF
> + select GENERIC_PHY
> + help
> + Enable this to add support for the Lynx SerDes 28G PHY as
> + found on NXP's Layerscape platforms such as LX2160A.
> + Used to change the protocol running on SerDes lanes at runtime.
> + Only useful for a restricted set of Ethernet protocols.
> ++
> + endif
The above resolution is not correct: Layerscape is a different SoC
family than i.MX8, using ARCH_LAYERSCAPE instead of ARCH_MXC.
Hence PHY_FSL_LYNX_28G should be moved outside the if/endif block
(and gain a dependency on ARCH_LAYERSCAPE || COMPILE_TEST; I will
send a patch).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
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
