Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-07-23--00-00 (v6.16-rc6-1746-g4a87f138528a) remotes/brancher/net-next-hw-2025-07-23--08-00 (v6.16-rc6-1782-gcb2cc9fadf37) ==== BASE DIFF ==== drivers/net/can/dev/dev.c | 12 +- drivers/net/can/dev/netlink.c | 12 + drivers/net/ethernet/intel/e1000e/defines.h | 3 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 + drivers/net/ethernet/intel/e1000e/nvm.c | 6 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +- drivers/net/ethernet/intel/ice/ice_ddp.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +- .../net/ethernet/mellanox/mlx5/core/en/params.c | 45 +- .../net/ethernet/mellanox/mlx5/core/en/params.h | 6 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- .../mellanox/mlx5/core/steering/hws/definer.c | 13 +- drivers/net/netdevsim/netdev.c | 21 +- include/linux/mlx5/mlx5_ifc.h | 58 +- include/trace/events/tcp.h | 27 +- net/Kconfig | 6 +- net/ipv4/tcp_input.c | 10 +- net/ipv4/tcp_output.c | 46 +- tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/xdp.py | 656 +++++++++++++++++++++ tools/testing/selftests/net/lib/xdp_native.bpf.c | 621 +++++++++++++++++++ .../selftests/net/netfilter/conntrack_clash.sh | 45 +- 23 files changed, 1499 insertions(+), 138 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.JmEL4Fi3Ex b/tmp/tmp.d7nkJSd4MQ index efae4dd56aad..877854466ea0 100644 --- a/tmp/tmp.JmEL4Fi3Ex +++ b/tmp/tmp.d7nkJSd4MQ @@ -7,6 +7,23 @@ tc_action dbg [local patch] forwarding: set timeout to 3 hours [local patch] selftests: net: enable profiling [local patch] timestamp - try waking [local patch] +net: define an enum for the napi threaded state +net: Use netif_threaded_enable instead of netif_set_threaded in drivers +net: Create separate gro_flush_normal function +net: otx2: handle NULL returned by xdp_convert_buff_to_frame() +sfc: siena: handle NULL returned by xdp_convert_buff_to_frame() +sfc: handle NULL returned by xdp_convert_buff_to_frame() +net/mlx5: Fix build -Wframe-larger-than warnings +sctp: Replace sockaddr with sockaddr_inet in sctp_addr union +wireguard: peer: Replace sockaddr with sockaddr_inet +ipv6: Add sockaddr_inet unified address structure +net: Document sockaddr safety in ARP and routing UAPI structures +MAINTAINERS: Add in6.h to MAINTAINERS +selftests: drv-net: devmem: use new mattr ynl helpers +tools: ynl-gen: print setters for multi-val attrs +tools: ynl-gen: print alloc helper for multi-val attrs +tools: ynl-gen: move free printing to the print_type_full() helper +tools: ynl-gen: don't add suffix for pure types s390/ism: fix concurrency management in ism_cmd() net/sched: mqprio: fix stack out-of-bounds write in tc entry parsing net/mlx5e: Expose TIS via devlink tx reporter diagnose @@ -16,7 +33,21 @@ net: hns3: fixed vf get max channels bug net: hns3: disable interrupt when ptp init failed net: hns3: fix concurrent setting vlan filter issue selftests: drv-net: wait for iperf client to stop sending -can: netlink: can_changelink(): fix NULL pointer deref of struct can_priv::do_set_mode +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 +net: phy: qca807x: Support SFP through phy_port interface +net: phy: at803x: Support SFP through phy_port interface +net: phy: marvell10g: Support SFP through phy_port +net: phy: marvell: Support SFP through phy_port interface +net: phy: marvell-88x2222: Support SFP through phy_port interface +net: phy: Introduce generic SFP handling for PHY drivers +net: phy: Create a phy_port for PHY-driven SFPs +net: phy: dp83822: Add support for phy_port representation +net: phy: Introduce PHY ports representation +net: ethtool: Introduce ETHTOOL_LINK_MEDIUM_* values +net: ethtool: common: Indicate that BaseT works on up to 4 lanes +dt-bindings: net: Introduce the ethernet-connector description Documentation: netlink: specs: tc: Add DualPI2 specification selftests/tc-testing: Add selftests for qdisc DualPI2 selftests/tc-testing: Fix warning and style check on tdc.sh @@ -40,12 +71,9 @@ tcp: reorganize SYN ECN code netdevsim: add fw_update_flash_chunk_time_ms debugfs knobs devlink: Fix excessive stack usage in rate TC bandwidth parsing vxlan: remove redundant conversion of vni in vxlan_nl2conf -Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux ipv6: add `force_forwarding` sysctl to enable per-interface forwarding net: stmmac: Check stmmac_hw_setup() in stmmac_resume() net: stmmac: Return early if invalid in loongson_dwmac_fix_reset() -net: Restore napi threaded state only when it is enabled -selftests: netfilter: tone-down conntrack clash test net-memcg: Allow decoupling memcg from global protocol memory accounting. net-memcg: Store memcg->socket_isolated in sk->sk_memcg. net-memcg: Add memory.socket_isolated knob. @@ -59,13 +87,6 @@ net: Call trace_sock_exceed_buf_limit() for memcg failure with SK_MEM_RECV. tcp: Simplify error path in inet_csk_accept(). mptcp: Use tcp_under_memory_pressure() in mptcp_epollin_ready(). mptcp: Fix up subflow's memcg when CONFIG_SOCK_CGROUP_DATA=n. -e1000e: ignore uninitialized checksum word on tgp -e1000e: disregard NVM checksum on tgp when valid checksum bit is not set -ice: Fix a null pointer dereference in ice_copy_and_init_pkg() -i40e: When removing VF MAC filters, only check PF-set MAC -i40e: report VF tx_dropped with tx_errors instead of tx_discards -tcp: do not increment BeyondWindow MIB for old seq -tcp: do not set a zero size receive buffer selftests: rtnetlink: add macsec and vlan nesting test macsec: set IFF_UNICAST_FLT priv flag netconsole: use netpoll_parse_ip_addr in local_ip_store @@ -76,11 +97,7 @@ netpoll: Remove unused fields from inet_addr union net: ti: icssg-prueth: Fix skb handling for XDP_PASS xen/netfront: Fix TX response spurious interrupts Octeontx2-vf: Fix max packet length errors -net/mlx5e: Remove duplicate mkey from SHAMPO header -net/mlx5e: SHAMPO, Remove mlx5e_shampo_get_log_hd_entry_size() -net/mlx5e: SHAMPO, Cleanup reservation size formula usbnet: Set duplex status to unknown in the absence of MII -tcp: trace retransmit failures in tcp_retransmit_skb libeth: xdp: access ->pp through netmem_desc instead of page net: ti: icssg-prueth: access ->pp through netmem_desc instead of page mlx5: access ->pp through netmem_desc instead of page @@ -93,12 +110,3 @@ netdevsim: access ->pp through netmem_desc instead of page netmem, mlx4: access ->pp_ref_count through netmem_desc instead of page netmem: use netmem_desc instead of page to access ->pp in __netmem_get_pp() netmem: introduce struct netmem_desc mirroring struct page -net: Kconfig: add endif/endmenu comments -selftests: drv-net: Test head-adjustment support -selftests: drv-net: Test tail-adjustment support -selftests: drv-net: Test XDP_TX support -selftests: drv-net: Test XDP_PASS/DROP support -net: netdevsim: hook in XDP handling -net/mlx5: Expose cable_length field in PFCC register -net/mlx5: Add IFC bits and enums for buf_ownership -net/mlx5: Add IFC bits to support RSS for IPSec offload