Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-10-25--00-00 (v6.18-rc2-540-g607f84272ede) remotes/brancher/net-next-2025-10-25--03-00 (v6.18-rc2-556-g2c0c2b9cb5f7) ==== BASE DIFF ==== .../devicetree/bindings/net/rockchip-dwmac.yaml | 3 + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- MAINTAINERS | 1 + drivers/net/ethernet/renesas/ravb.h | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 16 ++- drivers/net/ethernet/stmicro/stmmac/common.h | 5 + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 64 ++++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 7 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 26 ++-- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 - drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 27 +++-- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 16 +++ drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 11 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 31 +---- drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 3 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 45 ++++--- drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c | 22 +++- drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 4 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 +- drivers/net/phy/dp83867.c | 6 + drivers/net/phy/phy_device.c | 14 ++- drivers/net/phy/phylink.c | 92 ++++++++++++++- drivers/net/usb/usbnet.c | 49 ++++---- include/linux/phy.h | 21 ++++ include/linux/phylink.h | 28 +++++ include/net/neighbour.h | 17 ++- net/atm/clip.c | 4 +- net/core/neighbour.c | 131 +++++++++++---------- net/ipv4/arp.c | 4 +- net/ipv6/ndisc.c | 8 +- net/smc/af_smc.c | 16 +-- net/strparser/strparser.c | 2 +- tools/testing/selftests/net/netlink-dumps.c | 1 + 35 files changed, 490 insertions(+), 204 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.sqTdp6wPMV b/tmp/tmp.zAxH4rm6jj index 5f9650afca04..79a9ab7de781 100644 --- a/tmp/tmp.sqTdp6wPMV +++ b/tmp/tmp.zAxH4rm6jj @@ -12,7 +12,28 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests nipa: fbnic: link up on QEMU -dt-bindings: net: phy: vsc8531: Convert to DT schema +net: hibmcge: fix the inappropriate netif_device_detach() +net: hibmcge: remove unnecessary check for np_link_fail in scenarios without phy. +net: hibmcge: fix rx buf avl irq is not re-enabled in irq_handle issue +tools: ynl: rework the string representation of NlError +ice: remove duplicate call to ice_deinit_hw() on error paths +ice: move ice_deinit_dev() to the end of deinit paths +ice: extract ice_init_dev() from ice_init() +ice: move ice_init_pf() out of ice_init_dev() +ice: move udp_tunnel_nic and misc IRQ setup into ice_init_pf() +ice: ice_init_pf: destroy mutexes and xarrays on memory alloc failure +ice: move ice_init_interrupt_scheme() prior ice_init_pf() +ice: move service task start out of ice_init_pf() +ice: enforce RTNL assumption of queue NAPI manipulation +net: ethernet: ti: am65-cpsw: remove cpsw_ale_classifier_setup_default() +net: ethernet: ti: am65-cpsw: add network flow classification support +net: ethernet: ti: cpsw_ale: add policer save restore for PM sleep +net: ethernet: ti: cpsw_ale: add cpsw_ale_policer_set/clr_entry() +net: ethernet: ti: cpsw_ale: add cpsw_ale_policer_reset_entry() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_ucast() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_vlan_add_modify() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_vlan() +net: ethernet: ti: cpsw_ale: Update Policer fields for more ALE size/ports net: stmmac: mdio: fix smatch warning dpll: fix device-id-get and pin-id-get to return errors properly dpll: spec: add missing module-name and clock-id to pin-get reply @@ -20,7 +41,6 @@ idpf: correct queue index in Rx allocation error messages net: ethernet: emulex: benet: fix adapter->fw_on_flash truncation warning net: netmem: remove NET_IOV_MAX from net_iov_type enum isdn: mISDN: hfcsusb: fix memory leak in hfcsusb_probe() -nft_ct: Added nfct_seqadj_ext_add() for DNAT'ed conntrack. net: cxgb4/ch_ipsec: fix potential use-after-free in ch_ipsec_xfrm_add_state() callback io_uring: Introduce getsockname io_uring cmd socket: Split out a getsockname helper for io_uring @@ -44,16 +64,11 @@ batman-adv: Start new development cycle net: rps: softnet_data reorg to make enqueue_to_backlog() fast batman-adv: Release references to inactive interfaces net: optimize enqueue_to_backlog() for the fast path -net: dsa: yt921x: Fix missing type casting to u64 virtio-net: correct hdr_len handling for tunnel gso virtio-net: correct hdr_len handling for VIRTIO_NET_F_GUEST_HDRLEN virtio-net: fix incorrect flags recording in big mode -net: jme: migrate to dma_map_phys instead of map_page net: stmmac: Add a devlink attribute to control timestamping mode net: stmmac: Move subsecond increment configuration in dedicated helper -xfrm: Determine inner GSO type from packet inner protocol -xfrm: Check inner packet family directly from skb_dst -xfrm: Remove redundant state inner mode check net/sched: Remove unused typedef psched_tdiff_t net: mana: Support HW link state events sctp: Remove sctp_copy_sock() and sctp_copy_descendant(). @@ -74,10 +89,8 @@ net: add per-netns sysctl for devmem autorelease net: devmem: use niov array for token management net: devmem: refactor sock_devmem_dontneed for autorelease split net: devmem: rename tx_vec to vec in dmabuf binding -selftest: net: prevent use of uninitialized variable phy: mscc: Fix PTP for VSC8574 and VSC8572 phy: mscc: Use PHY_ID_MATCH_EXACT for VSC8584, VSC8582, VSC8575, VSC856X -selftests/unix: Add test for ECONNRESET and EOF behaviour net: macb: Add "mobileye,eyeq5-gem" compatible net: macb: rename bp->sgmii_phy field to bp->phy net: macb: add no LSO capability (MACB_CAPS_NO_LSO) @@ -85,10 +98,6 @@ net: macb: match skb_reserve(skb, NET_IP_ALIGN) with HW alignment dt-bindings: net: cdns,macb: add Mobileye EyeQ5 ethernet interface dibs: Use subsys_initcall() dibs: Remove reset of static vars in dibs_init() -veth: more robust handing of race to avoid txq getting stuck -veth: stop and start all TX queue in netdev down/up -veth: enable dev_watchdog for detecting stalled TXQs -net: phy: dp83867: Disable EEE support as not implemented net/tcp: add packetdrill test for FIN-WAIT-1 zero-window fix net/tcp: fix permanent FIN-WAIT-1 state with continuous zero window packets selftests: bridge_mdb: Add a test for MDB flush on snooping disable @@ -102,16 +111,6 @@ net: hns3: return error code when function fails selftests/bpf: Add mptcp test with sockmap bpf,sockmap: disallow MPTCP sockets from sockmap net,mptcp: fix proto fallback detection with BPF sockmap -net: ravb: Allocate correct number of queues based on SoC support -net: ravb: Make DBAT entry count configurable per-SoC -MAINTAINERS: add dwmac-rk glue driver to the main Rockchip entry -ethernet: stmmac: dwmac-rk: Add RK3506 GMAC support -dt-bindings: net: rockchip-dwmac: Add compatible string for RK3506 -dt-bindings: net: snps,dwmac: Sync list of Rockchip compatibles -dt-bindings: net: snps,dwmac: move rk3399 line to its correct position -net: usb: usbnet: coding style for functions -net: stmmac: add support for controlling PCS interrupts -net: stmmac: add stmmac_mac_irq_modify() net: ti: icssg-prueth: Enable zero copy in XDP features net: ti: icssg-prueth: Add AF_XDP zero copy for RX net: ti: icssg-prueth: Make emac_run_xdp function independent of page @@ -124,12 +123,6 @@ net/mlx5: Refactor HCA cap 2 setting net/mlx5: Refactor PTP clock devcom pairing net/mlx5: Add software system image GUID infrastructure net/mlx5: Use common mlx5_same_hw_devs function -net: stmmac: convert to phylink managed WoL PHY speed -net: stmmac: convert to phylink-managed Wake-on-Lan -net: phylink: add phylink managed wake-on-lan PHY speed control -net: phylink: add phylink managed MAC Wake-on-Lan support -net: phy: add phy_may_wakeup() -net: phy: add phy_can_wakeup() xsk: add indirect call for xsk_destruct_skb net: enetc: add standalone ENETC support for i.MX94 net: enetc: add basic support for the ENETC with pseudo MAC for i.MX94 @@ -149,11 +142,9 @@ eea: create/destroy rx,tx queues for netdevice open and stop eea: probe the netdevice and create adminq eea: introduce ring and descriptor structures eea: introduce PCI framework -smc: rename smc_find_ism_store_rc to reflect broader usage net: txgbe: support RSC offload net: txgbe: support TX head write-back mode net: txgbe: support RX desc merge mode -strparser: fix typo in comment selftests/vsock: add vsock_loopback module loading selftests/vsock: add 1.37 to tested virtme-ng versions selftests/vsock: avoid false-positives when checking dmesg @@ -180,11 +171,6 @@ net: mdio: reset PHY before attempting to access registers in fwnode_mdiobus_reg net: mdio: introduce mdio_device_has_reset() net: mdio: change property read from fwnode_property_read_u32() to device_property_read_u32() net: mdio: common handling of phy reset properties -neighbour: Convert rwlock of struct neigh_table to spinlock. -neighbour: Convert RTM_SETNEIGHTBL to RCU. -neighbour: Convert RTM_GETNEIGHTBL to RCU. -neighbour: Annotate access to neigh_parms fields. -neighbour: Use RCU list helpers for neigh_parms.list writers. Bluetooth: rfcomm: fix modem control handling Bluetooth: hci_core: Fix tracking of periodic advertisement Bluetooth: hci_conn: Fix connection cleanup with BIG with 2 or more BIS