On Tue, Aug 17, 2021 at 02:16:43PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/ptp/Kconfig
>
> between commit:
>
> 55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
>
> from the net tree and commit:
>
> e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
>
> from the net-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, the result is correct.
> diff --cc drivers/ptp/Kconfig
> index e085c255da0c,823eae1b4b53..000000000000
> --- a/drivers/ptp/Kconfig
> +++ b/drivers/ptp/Kconfig
> @@@ -90,9 -103,8 +103,9 @@@ config PTP_1588_CLOCK_INE
> config PTP_1588_CLOCK_PCH
> tristate "Intel PCH EG20T as PTP clock"
> depends on X86_32 || COMPILE_TEST
> - depends on HAS_IOMEM && NET
> + depends on HAS_IOMEM && PCI
> + depends on NET
> - imply PTP_1588_CLOCK
> + depends on PTP_1588_CLOCK
> help
> This driver adds support for using the PCH EG20T as a PTP
> clock. The hardware supports time stamping of PTP packets
--
With Best Regards,
Andy Shevchenko
