Commit dd720783 authored by Paolo Abeni's avatar Paolo Abeni
Browse files
Merge in late fixes to prepare for the 6.13 net-next PR.

Conflicts:

include/linux/phy.h
  41ffcd95 net: phy: fix phylib's dual eee_enabled
  721aa69e 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
  2160428b net: txgbe: fix null pointer to pcs
  2160428b net: txgbe: remove GPIO interrupt controller

Adjacent commits:

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

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 96ed62ea 66418447
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment