tree d72e809d28ff7a1cb02f648c858d106de1be859d
parent 9e5f10fe577be7974c721c0c2050fa6c967d4565
parent f87d64319e6f980c82acfc9b95ed523d053fb7ac
author Jakub Kicinski <kuba@kernel.org> 1629421758 -0700
committer Jakub Kicinski <kuba@kernel.org> 1629421758 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/ptp/Kconfig:
  55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
  e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>