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

Merge in late fixes to prepare for the 6.13 net-next PR.

Conflicts:

include/linux/phy.h
  41ffcd9501 net: phy: fix phylib's dual eee_enabled
  721aa69e70 net: phy: convert eee_broken_modes to a linkmode bitmap
https://lore.kernel.org/all/20241118135512.1039208b@canb.auug.org.au/

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
  2160428bcb net: txgbe: fix null pointer to pcs
  2160428bcb net: txgbe: remove GPIO interrupt controller

Adjacent commits:

include/linux/phy.h
  41ffcd9501 net: phy: fix phylib's dual eee_enabled
  516a5f11eb net: phy: respect cached advertising when re-enabling EEE

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

2024-11-19 13:56:02 +01:00

..

fbnic

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

2024-11-19 13:56:02 +01:00

Kconfig

eth: fbnic: add CONFIG_PTP_1588_CLOCK_OPTIONAL dependency

2024-10-20 10:17:31 -05:00

Makefile

…