Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-27--00-00 (v6.18-rc6-1552-gbfb4344d3294) remotes/brancher/net-next-2025-11-27--03-00 (v6.18-rc6-1525-ga022291c249e) ==== BASE DIFF ==== Documentation/netlink/specs/rt-addr.yaml | 1 + Documentation/netlink/specs/rt-link.yaml | 2 + MAINTAINERS | 2 +- drivers/net/dsa/sja1105/sja1105_main.c | 7 - drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 45 +++ drivers/net/ethernet/freescale/fman/fman_memac.c | 91 ++++++ drivers/net/ethernet/freescale/fman/mac.h | 14 + drivers/net/ethernet/hisilicon/Kconfig | 1 + drivers/net/ethernet/hisilicon/hibmcge/Makefile | 1 + .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 8 + drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 4 + drivers/net/ethernet/hisilicon/hibmcge/hbg_trace.h | 84 ++++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 217 +++++++++++--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 17 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 19 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 18 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 19 +- drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 23 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 11 +- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 14 +- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 2 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 +- drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 36 +-- .../net/ethernet/stmicro/stmmac/stmmac_libpci.c | 48 +++ .../net/ethernet/stmicro/stmmac/stmmac_libpci.h | 12 + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 36 +-- drivers/net/ethernet/ti/netcp_ethss.c | 2 +- drivers/net/phy/bcm-phy-ptp.c | 21 +- drivers/net/phy/dp83640.c | 29 +- drivers/net/phy/dp83867.c | 36 ++- drivers/net/phy/micrel.c | 16 +- drivers/net/phy/microchip_rds_ptp.c | 8 +- drivers/net/phy/mscc/mscc_ptp.c | 21 +- drivers/net/phy/nxp-c45-tja11xx.c | 22 +- drivers/net/phy/phy.c | 14 +- drivers/net/wwan/mhi_wwan_mbim.c | 2 +- drivers/ptp/ptp_ines.c | 31 +- include/linux/mii_timestamper.h | 13 +- include/linux/phy.h | 4 +- net/core/dev_ioctl.c | 9 +- net/mptcp/protocol.c | 13 +- tools/net/ynl/Makefile | 8 +- tools/net/ynl/tests/Makefile | 32 ++ tools/net/ynl/tests/config | 6 + tools/net/ynl/tests/test_ynl_cli.sh | 327 +++++++++++++++++++++ tools/net/ynl/tests/test_ynl_ethtool.sh | 222 ++++++++++++++ .../tcp_syscall_bad_arg_sendmsg-empty-iov.pkt | 4 + .../net/packetdrill/tcp_zerocopy_basic.pkt | 2 + .../net/packetdrill/tcp_zerocopy_batch.pkt | 2 + .../net/packetdrill/tcp_zerocopy_client.pkt | 2 + .../net/packetdrill/tcp_zerocopy_closed.pkt | 2 + .../net/packetdrill/tcp_zerocopy_epoll_edge.pkt | 3 + .../packetdrill/tcp_zerocopy_epoll_exclusive.pkt | 3 + .../net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt | 3 + .../packetdrill/tcp_zerocopy_fastopen-client.pkt | 2 + .../packetdrill/tcp_zerocopy_fastopen-server.pkt | 2 + .../net/packetdrill/tcp_zerocopy_maxfrags.pkt | 2 + .../net/packetdrill/tcp_zerocopy_small.pkt | 2 + tools/testing/selftests/net/so_txtime.c | 2 +- tools/testing/selftests/net/txtimestamp.c | 2 +- 64 files changed, 1403 insertions(+), 237 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.pk7NMFulw5 b/tmp/tmp.6ubBPznOPe index e519704cb7cf..f1270227b694 100644 --- a/tmp/tmp.pk7NMFulw5 +++ b/tmp/tmp.6ubBPznOPe @@ -11,6 +11,8 @@ nipa: local: add short sleep to bond_macvlan_ipvlan.sh nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests +net: restore napi_consume_skb()'s NULL-handling +gve: Fix race condition on tx->dropped_pkt update ipv4: Fix log message for martian source bnxt_en: Add PTP .getcrosststamp() interface to get device/host times bnxt_en: Add Virtual Admin Link State Support for VFs @@ -19,11 +21,6 @@ bnxt_en: Add CQ ring dump to bnxt_dump_cp_sw_state() bnxt_en: Remove the redundant BNXT_EN_FLAG_MSIX_REQUESTED flag bnxt_en: Enhance log message in bnxt_get_module_status() bnxt_en: Enhance TX pri counters -selftests: netconsole: validate target resume -netconsole: resume previously deactivated target -netconsole: add STATE_DEACTIVATED to track targets disabled by low level -netconsole: convert 'enabled' flag to enum for clearer state management -netconsole: add target_state enum selftests: ipv6_icmp: add tests for ICMPv6 handling ipv6: use the right ifindex when replying to icmpv6 from localhost selftests/tc-testing: Update test cases with netem duplicate @@ -47,18 +44,6 @@ bng_en: Handle an HWRM completion request bng_en: Add RX support bng_en: Extend bnge_set_ring_params() for rx-copybreak bng_en: Query PHY and report link status -virtio_net: Add get ethtool flow rules ops -virtio_net: Add support for TCP and UDP ethtool rules -virtio_net: Add support for IPv6 ethtool steering -virtio_net: Implement IPv4 ethtool flow rules -virtio_net: Use existing classifier if possible -virtio_net: Implement layer 2 ethtool flow rules -virtio_net: Create a FF group for ethtool steering -virtio_net: Query and set flow filter caps -virtio: Expose object create and destroy API -virtio: Expose generic device capability operations -virtio: Add config_op for admin commands -virtio_pci: Remove supported_cap size build assert net: ti: icssm-prueth: Add support for ICSSM RSTP switch net: ti: icssm-prueth: Add switchdev support for icssm_prueth driver net: ti: icssm-prueth: Add helper functions to configure and maintain FDB @@ -92,7 +77,6 @@ netmem, devmem, tcp: access pp fields through @desc in net_iov eth: bnxt: make use of napi_consume_skb() net: atlantic: fix fragment overflow handling in RX path MAINTAINERS: separate VIRTIO NET DRIVER and add netdev -selftests/net: packetdrill: pass send_omit_free to MSG_ZEROCOPY tests iavf: clarify VLAN add/delete log messages and lower log level ice: fix comment typo and correct module format string idpf: correct queue index in Rx allocation error messages @@ -105,7 +89,6 @@ ixgbe: Add 10G-BX support ice: unify PHY FW loading status handler for E800 devices ice: add support for unmanaged DPLL on E830 NIC virtio-net: avoid unnecessary checksum calculation on guest RX -eth: fbnic: Fix counter roll-over issue hsr: fix NULL pointer dereference in skb_clone with hw tag insertion net/mlx5: Document devlink rates net/mlx5: qos: Enable cross-device scheduling @@ -131,32 +114,10 @@ tun: correct drop statistics in tun_get_user tun: correct drop statistics in tun_put_user tun: correct drop statistics in tun_xdp_one tun: cleanup out label in tun_xdp_one -mptcp: clear scheduled subflows on retransmit -selftests/net: initialize char variable to null net: stmmac: dwmac: Disable flushing frames on Rx Buffer Unavailable -selftests: net: tests for add double tunneling GRO/GSO -geneve: use GRO hint option in the RX path -geneve: extract hint option at GRO stage -geneve: add GRO hint output path -geneve: pass the geneve device ptr to geneve_build_skb() -geneve: constify geneve_hlen() -geneve: add netlink support for GRO hint -vxlan: expose gso partial features for tunnel offload -geneve: expose gso partial features for tunnel offload -net: introduce mangleid_features xsk: skip validating skb list in xmit path selftests: af_unix: remove unused stdlib.h include -netlink: specs: add big-endian byte-order for u32 IPv4 addresses net: pcs: lynx: accept in-band autoneg for 2500base-x -fm10k: extract GRXRINGS from .get_rxnfc -ixgbevf: extract GRXRINGS from .get_rxnfc -igc: extract GRXRINGS from .get_rxnfc -igb: extract GRXRINGS from .get_rxnfc -idpf: extract GRXRINGS from .get_rxnfc -ice: extract GRXRINGS from .get_rxnfc -iavf: extract GRXRINGS from .get_rxnfc -i40e: extract GRXRINGS from .get_rxnfc -s390/net: list Aswin Karuvally as maintainer net: fec: do not register PPS event for PEROUT net: fec: do not allow enabling PPS and PEROUT simultaneously net: fec: do not update PEROUT if it is enabled @@ -164,19 +125,7 @@ net: fec: cancel perout_timer when PEROUT is disabled net/mlx5e: Refine TX timeout handling to skip non-timed-out SQ net: hns3: Use netif_xmit_timeout_ms() helper net: Introduce netif_xmit_time_out_duration() helper -net: wwan: mhi: Keep modem name match with Foxconn T99W640 net: mctp: unconditionally set skb->dev on dst output -net: wwan: mhi_wwan_mbim: Avoid -Wflex-array-member-not-at-end warning -ptp: ptp_ines: add HW timestamp configuration reporting -net: phy: nxp-c45-tja11xx: add HW timestamp configuration reporting -phy: mscc: add HW timestamp configuration reporting -net: phy: dp83640: add HW timestamp configuration reporting -net: phy: broadcom: add HW timestamp configuration reporting -phy: add hwtstamp_get callback to phy drivers -phy: rename hwtstamp callback to hwtstamp_set -net: stmmac: pci: Use generic PCI suspend/resume routines -net: stmmac: loongson: Use generic PCI suspend/resume routines -net: stmmac: Add generic suspend/resume helper for PCI-based controllers quic: add packet parser base quic: add packet builder base quic: add frame encoder and decoder base @@ -197,14 +146,7 @@ amd-xgbe: schedule NAPI on Rx Buffer Unavailable to prevent RX stalls selftests: bonding: add mux and churn state testing bonding: restructure ad_churn_machine bonding: set AD_RX_PORT_DISABLED when disabling a port -tools: ynl: add YNL test framework -eea: introduce ethtool support -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 net: mana: Implement ndo_tx_timeout and serialize queue resets per port. -amd-xgbe: let the MAC manage PHY PM Documentation: networking: Document the phy_port infrastructure net: phy: dp83822: Add SFP support through the phy_port interface net: phy: Only rely on phy_port for PHY-driven SFP @@ -220,13 +162,6 @@ net: phy: dp83822: Add support for phy_port representation net: phy: Introduce PHY ports representation net: ethtool: Introduce ETHTOOL_LINK_MEDIUM_* values dt-bindings: net: Introduce the ethernet-connector description -net: fman_memac: report structured ethtool counters -net: dpaa: fman_memac: complete phylink support with 2500base-x -net: dsa: sja1105: fix SGMII linking at 10M or 100M but not passing traffic -net: phy: dp83867: implement configurability for SGMII in-band auto-negotiation -net: hibmcge: add support for pagepool on rx -net: hibmcge: reduce packet drop under stress testing -net: hibmcge: add support for tracepoint to dump some fields of rx_desc fbnic: Replace use of internal PCS w/ Designware XPCS fbnic: Add SW shim for MDIO interface to PMD and PCS fbnic: Add handler for reporting link down event statistics