]> Git Repo - linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <[email protected]>
Tue, 19 Nov 2024 12:27:50 +0000 (13:27 +0100)
committerPaolo Abeni <[email protected]>
Tue, 19 Nov 2024 12:56:02 +0000 (13:56 +0100)
commitdd7207838d38780b51e4690ee508ab2d5057e099
treeafcf5e28f88a62efe57bcdff46419084b808839c
parent96ed62ea02984f14b6d4f2e4aed327d803875b7a
parent66418447d27b7f4c027587582a133dd0bc0a663b
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
  41ffcd95015f net: phy: fix phylib's dual eee_enabled
  721aa69e708b 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
  2160428bcb20 net: txgbe: fix null pointer to pcs
  2160428bcb20 net: txgbe: remove GPIO interrupt controller

Adjacent commits:

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

Signed-off-by: Paolo Abeni <[email protected]>
MAINTAINERS
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
drivers/net/phy/phy-c45.c
drivers/net/phy/phy_device.c
include/linux/netpoll.h
include/linux/phy.h
net/core/netdev-genl.c
net/core/netpoll.c
net/xdp/xsk.c
This page took 0.077134 seconds and 4 git commands to generate.