Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-26--00-00 (v6.18-rc6-1442-g734f9d40b4bd) remotes/brancher/net-next-hw-2025-11-26--08-00 (v6.18-rc6-1476-g0eb8b2df0a75) ==== BASE DIFF ==== .../net_cachelines/inet_connection_sock.rst | 2 +- drivers/android/binder_netlink.c | 1 + drivers/android/binder_netlink.h | 1 + drivers/dpll/dpll_nl.c | 1 + drivers/dpll/dpll_nl.h | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 4 +- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/sched.c | 44 ++--- drivers/net/ethernet/chelsio/cxgb4/sched.h | 12 +- .../chelsio/inline_crypto/chtls/chtls_io.c | 8 +- drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 6 + .../net/ethernet/freescale/enetc/enetc_pf_common.c | 14 +- .../net/ethernet/freescale/enetc/netc_blk_ctrl.c | 198 ++++++++++++++++++++- drivers/net/ethernet/intel/ice/virt/queues.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 95 +++++----- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- drivers/net/mdio/of_mdio.c | 5 +- drivers/net/ovpn/netlink-gen.c | 1 + drivers/net/ovpn/netlink-gen.h | 1 + drivers/net/pcs/pcs-xpcs-plat.c | 3 - drivers/net/phy/mdio_bus.c | 56 +++++- drivers/net/phy/mdio_device.c | 6 + drivers/net/phy/mxl-gpy.c | 115 +++++++++++- drivers/net/team/team_core.c | 23 ++- drivers/net/team/team_nl.c | 1 + drivers/net/team/team_nl.h | 1 + drivers/net/virtio_net.c | 44 +++-- drivers/ptp/ptp_ocp.c | 46 ++--- fs/lockd/netlink.c | 1 + fs/lockd/netlink.h | 1 + fs/nfsd/netlink.c | 1 + fs/nfsd/netlink.h | 1 + include/net/inet_connection_sock.h | 20 ++- include/net/sock.h | 13 +- include/uapi/linux/android/binder_netlink.h | 1 + include/uapi/linux/dpll.h | 1 + include/uapi/linux/ethtool_netlink_generated.h | 1 + include/uapi/linux/fou.h | 1 + include/uapi/linux/handshake.h | 1 + include/uapi/linux/if_team.h | 1 + include/uapi/linux/lockd_netlink.h | 1 + include/uapi/linux/mptcp_pm.h | 1 + include/uapi/linux/net_shaper.h | 1 + include/uapi/linux/netdev.h | 1 + include/uapi/linux/nfsd_netlink.h | 1 + include/uapi/linux/ovpn.h | 1 + include/uapi/linux/psp.h | 1 + net/core/netdev-genl-gen.c | 1 + net/core/netdev-genl-gen.h | 1 + net/core/sock.c | 4 +- net/devlink/netlink_gen.c | 1 + net/devlink/netlink_gen.h | 1 + net/dsa/conduit.c | 145 ++++++++++----- net/handshake/genl.c | 1 + net/handshake/genl.h | 1 + net/ipv4/fou_nl.c | 1 + net/ipv4/fou_nl.h | 1 + net/ipv4/inet_connection_sock.c | 12 +- net/ipv4/inet_diag.c | 8 +- net/ipv4/tcp_ipv4.c | 8 +- net/ipv4/tcp_timer.c | 23 ++- net/ipv6/tcp_ipv6.c | 8 +- net/mptcp/mptcp_pm_gen.c | 1 + net/mptcp/mptcp_pm_gen.h | 1 + net/mptcp/protocol.c | 27 ++- net/mptcp/protocol.h | 2 +- net/psp/psp-nl-gen.c | 1 + net/psp/psp-nl-gen.h | 1 + net/shaper/shaper_nl_gen.c | 1 + net/shaper/shaper_nl_gen.h | 1 + net/xdp/xsk.c | 143 +++++++++------ tools/include/uapi/linux/netdev.h | 1 + tools/net/ynl/pyynl/ynl_gen_c.py | 26 ++- tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 8 +- tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 8 +- tools/testing/selftests/net/.gitignore | 8 - tools/testing/selftests/net/af_unix/.gitignore | 8 + tools/testing/selftests/net/af_unix/so_peek_off.c | 4 +- tools/testing/vsock/vsock_test.c | 7 +- 82 files changed, 874 insertions(+), 344 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.PXjRfInrGI b/tmp/tmp.KaVS6dIxjJ index e6e8425b985e..b7bbb9645615 100644 --- a/tmp/tmp.PXjRfInrGI +++ b/tmp/tmp.KaVS6dIxjJ @@ -13,7 +13,38 @@ 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 -MAINTAINERS: separate VIRTIO NET DRIVERS and add netdev +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 +idpf: use desc_ring when checking completion queue DMA allocation +ixgbe: avoid redundant call to ixgbe_non_sfp_link_config() +e1000e: Remove unneeded checks +idpf: convert vport state to bitmap +ixgbevf: ixgbevf_q_vector clean up +ixgbe: Add 10G-BX support +ice: unify PHY FW loading status handler for E800 devices +ice: add support for unmanaged DPLL on E830 NIC +selftests/tc-testing: Check Cake Scheduler when enqueue drops packets +net/sched: sch_cake: Fix incorrect qlen reduction in cake_drop +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 +net/mlx5: qos: Support cross-device tx scheduling +net/mlx5: Store QoS sched nodes in the sh_devlink +net/mlx5: Expose a function to clear a vport's parent +net/mlx5: Introduce shared devlink instance for PFs on same chip +devlink: Allow rate node parents from other devlinks +devlink: Allow parent dev for rate-set and rate-new +devlink: Add parent dev to devlink API +devlink: Decouple rate storage from associated devlink object +devlink: Refactor devlink_rate_nodes_check +devlink: Add helpers to lock nested-in instances +documentation: networking: add shared devlink documentation +devlink: Reverse locking order for nested instances mptcp: Initialise rcv_mss before calling tcp_send_active_reset() in mptcp_do_fastclose(). tun: flush deferred skb free list before bulk NAPI cache get net: core: export skb_defer_free_flush @@ -24,9 +55,7 @@ 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 -l2tp: fix double dst_release() on sk_dst_cache race flow_dissector: save computed hash in __skb_get_hash_symmetric_net() -vhost/net: check peek_head_len after signal to guest to avoid delays mptcp: clear scheduled subflows on retransmit selftests/net: initialize char variable to null net: stmmac: dwmac: Disable flushing frames on Rx Buffer Unavailable @@ -40,7 +69,6 @@ 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 -net: stmmac: Fix E2E delay mechanism 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 @@ -54,17 +82,11 @@ 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 -xsk: remove spin lock protection of cached_prod -xsk: use atomic operations around cached_prod for copy mode -xsk: add atomic cached_prod for copy mode 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 net: fec: cancel perout_timer when PEROUT is disabled net: wwan: mhi_wwan_mbim: Avoid -Wflex-array-member-not-at-end warning -platform/x86: intel_pmc_ipc: fix ACPI buffer memory leak -selftest: af_unix: Extend recv() timeout in so_peek_off.c. -selftest: af_unix: Create its own .gitignore. 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 @@ -72,16 +94,9 @@ 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 -tcp: remove icsk->icsk_retransmit_timer -tcp: introduce icsk->icsk_keepalive_timer -net: move sk_dst_pending_confirm and sk_pacing_status to sock_read_tx group -tcp: rename icsk_timeout() to tcp_timeout_expires() -idpf: Fix kernel-doc descriptions to avoid warnings -ice: fix broken Rx on VFs 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 -net: mdio: remove redundant fwnode cleanup quic: add packet parser base quic: add packet builder base quic: add frame encoder and decoder base @@ -98,15 +113,7 @@ quic: provide family ops for address and protocol quic: provide common utilities and data structures net: build socket infrastructure for QUIC protocol net: define IPPROTO_QUIC and SOL_QUIC constants -net: atlantic: fix fragment overflow handling in RX path amd-xgbe: schedule NAPI on Rx Buffer Unavailable to prevent RX stalls -chtls: Avoid -Wflex-array-member-not-at-end warning -ptp: ocp: Reuse META's PCI vendor ID -ptp: ocp: Apply standard pattern for cleaning up loop -ptp: ocp: Make ptp_ocp_unregister_ext() NULL-aware -ptp: ocp: Refactor signal_show() and fix %ptT misuse -r8169: improve MAC EEE handling -net: mdio: eliminate kdoc warnings in mdio_device.c and mdio_bus.c selftests: bonding: add mux and churn state testing bonding: restructure ad_churn_machine bonding: set AD_RX_PORT_DISABLED when disabling a port @@ -116,11 +123,7 @@ 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 -vsock/test: Extend transport change null-ptr-deref test amd-xgbe: let the MAC manage PHY PM -r8169: fix RTL8127 hang on suspend/shutdown -net: phy: mxl-gpy: add support for MxL86252 and MxL86282 -net: phy: mxl-gpy: add support for MxL86211C 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 @@ -138,16 +141,11 @@ 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: append ethtool counters of all hidden ports to conduit -net: dsa: use kernel data types for ethtool ops on conduit -net: dsa: cpu_dp->orig_ethtool_ops might be NULL 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 -team: Move team device type change at the end of team_port_add -cxgb4: Rename sched_class to avoid type clash 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 @@ -162,9 +160,4 @@ 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 -net: sxgbe: fix potential NULL dereference in sxgbe_rx() -r8169: add support for RTL9151A net: mana: Handle hardware recovery events when probing the device -tools: ynl-gen: add regeneration comment -tools: ynl-gen: add function prefix argument -virtio_net: enhance wake/stop tx queue statistics accounting