Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-25--00-00 (v6.18-rc6-1417-gd1fa275fa20f) remotes/brancher/net-next-hw-2025-11-25--08-00 (v6.18-rc6-1390-g7d5ed3378cbd) ==== BASE DIFF ==== drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 14 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- drivers/net/hyperv/netvsc_drv.c | 15 +- drivers/net/ipvlan/ipvlan_core.c | 4 +- include/net/pkt_cls.h | 2 + include/net/sock.h | 2 + net/core/sock.c | 18 + net/ethernet/eth.c | 16 +- net/ipv4/af_inet.c | 17 +- net/mptcp/fastopen.c | 4 +- net/mptcp/mib.c | 1 - net/mptcp/mib.h | 1 - net/mptcp/mptcp_diag.c | 3 +- net/mptcp/pm.c | 4 +- net/mptcp/pm_kernel.c | 2 + net/mptcp/protocol.c | 422 +++++++++++++++------ net/mptcp/protocol.h | 51 ++- net/mptcp/subflow.c | 42 +- net/sched/em_cmp.c | 5 +- net/sched/em_nbyte.c | 2 + net/sched/em_text.c | 11 +- tools/testing/selftests/drivers/net/hw/Makefile | 23 +- tools/testing/selftests/drivers/net/hw/toeplitz.c | 65 +++- tools/testing/selftests/drivers/net/hw/toeplitz.py | 28 +- .../testing/selftests/drivers/net/netcons_basic.sh | 5 +- .../testing/selftests/net/af_unix/unix_connreset.c | 8 +- 27 files changed, 564 insertions(+), 214 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.MUSCGsTtW0 b/tmp/tmp.Syt1vQs8DO index 1e5033216ee8..cfa5e4f7efb2 100644 --- a/tmp/tmp.MUSCGsTtW0 +++ b/tmp/tmp.Syt1vQs8DO @@ -15,7 +15,6 @@ nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests idpf: Fix kernel-doc descriptions to avoid warnings ice: fix broken Rx on VFs -selftests/net: initialize char variable to null 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 @@ -36,26 +35,15 @@ 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: ti: icssm-prueth: Adds support for ICSSM RSTP switch -net: ti: icssm-prueth: Adds switchdev support for icssm_prueth driver -net: ti: icssm-prueth: Adds helper functions to configure and maintain FDB net: atlantic: fix fragment overflow handling in RX path -net/ipv6: allow device-only routes via the multipath API 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 -platform/x86: intel_pmc_ipc: fix ACPI buffer memory leak -xsk: convert cq from spin lock protection into atomic operations -xsk: add the atomic parameter around cq in generic path -xsk: add atomic cached_prod for copy mode -idpf: remove __free usage in idpf_virtchnl -ice: remove __free usage in ice_flow r8169: improve MAC EEE handling net: mdio: eliminate kdoc warnings in mdio_device.c and mdio_bus.c -net: spacemit: Remove broken flow control support selftests: bonding: add mux and churn state testing bonding: restructure ad_churn_machine bonding: set AD_RX_PORT_DISABLED when disabling a port @@ -68,11 +56,7 @@ eea: introduce PCI framework vsock/test: Extend transport change null-ptr-deref test l2tp: fix double dst_release() on sk_dst_cache race amd-xgbe: let the MAC manage PHY PM -net: stmmac: imx: Do not stop RX_CLK in Rx LPI state for i.MX8MP -selftests: af_unix: don't use SKIP for expected failures -selftests: netfilter: nft_flowtable.sh: Add the capability to send IPv6 TCP traffic r8169: fix RTL8127 hang on suspend/shutdown -idpf: export RX hardware timestamping information to XDP 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 @@ -92,35 +76,16 @@ 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: pcs: lynx: accept in-band autoneg for 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: socket: add missing declaration for update_socket_protocol 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 -net/sched: sch_cake: Fix incorrect qlen reduction in cake_drop cxgb4: Rename sched_class to avoid type clash -net: mvpp2: extract GRXRINGS from .get_rxnfc -net: mvneta: convert to use .get_rx_ring_count -mptcp: leverage the backlog for RX packet processing -mptcp: introduce mptcp-level backlog -mptcp: borrow forward memory from subflow -mptcp: handle first subflow closing consistently -mptcp: drop the __mptcp_data_ready() helper -mptcp: make mptcp_destroy_common() static -mptcp: do not miss early first subflow close event notification -mptcp: ensure the kernel PM does not take action too late -mptcp: cleanup fallback dummy mapping generation -mptcp: cleanup fallback data fin reception -mptcp: fix memcg accounting for passive sockets -mptcp: grafting MPJ subflow earlier -mptcp: factor-out cgroup data inherit helper -net: factor-out _sk_charge() helper 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 @@ -130,18 +95,12 @@ net: pcs: xpcs: Add support for FBNIC 25G, 50G, 100G PMD net: pcs: xpcs: Fix PMA identifier handling in XPCS net: pcs: xpcs: Add support for 25G, 50G, and 100G interfaces net: phy: Add MDIO_PMA_CTRL1_SPEED for 2.5G and 5G to reflect PMA values -ipvlan: fix sparse warning about __be32 -> u32 -net: sched: fix TCF_LAYER_TRANSPORT handling in tcf_get_base_ptr() -selftests: netconsole: ensure required log level is set on netcons_basic -i40e: delete a stray tab 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 net: sxgbe: fix potential NULL dereference in sxgbe_rx() -net: ipv4: fix spelling typos in comments -net: hyperv: convert to use .get_rx_ring_count r8169: add support for RTL9151A net_sched: use qdisc_dequeue_drop() in cake, codel, fq_codel net_sched: add qdisc_dequeue_drop() helper @@ -157,25 +116,13 @@ net: use qdisc_pkt_len_segs_init() in sch_handle_ingress() net_sched: initialize qdisc_skb_cb(skb)->pkt_segs in qdisc_pkt_len_init() net: init shinfo->gso_segs from qdisc_pkt_len_init() net_sched: make room for (struct qdisc_skb_cb)->pkt_segs -net: optimize eth_type_trans() vs CONFIG_STACKPROTECTOR_STRONG=y net: lan966x: Fix the initialization of taprio -net: dsa: microchip: fix mdio parent bus reference leak -selftests: hw-net: toeplitz: give the test up to 4 seconds -selftests: hw-net: toeplitz: read indirection table from the device -selftests: hw-net: toeplitz: read the RSS key directly from C -selftests: hw-net: toeplitz: make sure NICs have pure Toeplitz configured -selftests: hw-net: auto-disable building the iouring C code -netmem: remove the pp fields from net_iov -netmem, devmem, tcp: access pp fields through @desc in net_iov -netmem, io_uring/zcrx: access pp fields through @desc in net_iov -NFC: Fix error handling in nfc_genl_dump_targets net: mana: Handle hardware recovery events when probing the device tools: ynl-gen: add regeneration comment tools: ynl-gen: add function prefix argument uapi: ioam6: adjust the maximum size of a schema net: phy: mxl-gpy: fix link properties on USXGMII and internal PHYs atm/fore200e: Fix possible data race in fore200e_open() -octeon_ep: reset firmware ready status net: dsa: microchip: Fix symetry in ksz_ptp_msg_irq_{setup/free}() net: dsa: microchip: Free previously initialized ports on init failures net: dsa: microchip: Don't free uninitialized ksz_irq @@ -183,7 +130,6 @@ net: dsa: microchip: ptp: Fix checks on irq_find_mapping() net: dsa: microchip: common: Fix checks on irq_find_mapping() net: aquantia: Add missing descriptor cache invalidation on ATL2 dt-bindings: net: aspeed: add AST2700 MDIO compatible -nfp: tls: Avoid -Wflex-array-member-not-at-end warnings vhost: rewind next_avail_head while discarding descriptors virtio_net: enhance wake/stop tx queue statistics accounting Documentation: net: add flow control guide and document ethtool API @@ -196,6 +142,3 @@ hinic3: Add .ndo_set_features and .ndo_fix_features hinic3: Add .ndo_tx_timeout and .ndo_get_stats64 hinic3: Add PF management interfaces hinic3: Add PF framework -net: enetc: update the base address of port MDIO registers for ENETC v4 -net: enetc: set external PHY address in IERB for i.MX94 ENETC -net: enetc: set the external PHY address in IERB for port MDIO usage