Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-04-25--00-00 (v6.15-rc3-605-gddd8fafeafcd) remotes/brancher/net-next-hw-2025-04-25--08-00 (v6.15-rc3-612-g49a54d443be8) ==== BASE DIFF ==== .../devicetree/bindings/net/brcm,asp-v2.0.yaml | 23 ++- .../devicetree/bindings/net/brcm,unimac-mdio.yaml | 2 +- Documentation/networking/rxrpc.rst | 24 --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 176 ++++++++------------- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 78 +++++---- .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 36 +---- drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 13 +- .../net/ethernet/broadcom/asp2/bcmasp_intf_defs.h | 3 +- drivers/net/ethernet/mediatek/mtk_eth_path.c | 2 +- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 +- .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 32 +++- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/rdma.h | 4 +- drivers/net/mdio/mdio-bcm-unimac.c | 2 +- drivers/net/netdevsim/netdev.c | 2 + include/linux/soc/mediatek/mtk_wed.h | 2 +- include/linux/tcp.h | 3 +- include/net/af_rxrpc.h | 3 - include/net/xdp_sock.h | 3 - include/net/xsk_buff_pool.h | 4 +- include/uapi/linux/tcp.h | 1 + net/ipv4/gre_demux.c | 2 +- net/ipv4/tcp.c | 3 + net/ipv4/tcp_fastopen.c | 1 + net/rxrpc/af_rxrpc.c | 41 ----- net/rxrpc/ar-internal.h | 1 - net/rxrpc/rxgk.c | 10 +- net/rxrpc/txbuf.c | 8 - net/xdp/xsk.c | 6 +- net/xdp/xsk_buff_pool.c | 1 + tools/net/ynl/Makefile.deps | 2 +- tools/testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 23 ++- tools/testing/selftests/drivers/net/ksft.h | 56 +++++++ tools/testing/selftests/drivers/net/napi_id.py | 23 +++ .../testing/selftests/drivers/net/napi_id_helper.c | 83 ++++++++++ tools/testing/selftests/drivers/net/xdp_helper.c | 49 +----- 40 files changed, 382 insertions(+), 374 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.vBOUmvhFaa b/tmp/tmp.t0zWTHFhnQ index 01201d7fc73f..dbf29b9fe400 100644 --- a/tmp/tmp.vBOUmvhFaa +++ b/tmp/tmp.t0zWTHFhnQ @@ -7,31 +7,7 @@ profile patch forwarding: set timeout to 3 hours bonding: assign random address if device address is same as bond rtase: Modify the condition used to detect overflow in rtase_calc_time_mitigation -tools: ynl: allow fixed-header to be specified per op -tools: ynl-gen: don't init enum checks for classic netlink -tools: ynl-gen: array-nest: support binary array with exact-len -tools: ynl-gen: array-nest: support put for scalar -tools: ynl-gen: mutli-attr: support binary types with struct -tools: ynl-gen: multi-attr: type gen for string -tools: ynl-gen: support CRUD-like notifications for classic Netlink -tools: ynl-gen: support using dump types for ntf -tools: ynl: let classic netlink requests specify extra nlflags -tools: ynl-gen: fill in missing empty attr lists -tools: ynl-gen: factor out free_needs_iter for a struct -tools: ynl-gen: fix comment about nested struct dict -selftests: drv-net: Test that NAPI ID is non-zero -selftests: drv-net: Factor out ksft C helpers -netdevsim: Mark NAPI ID on skb in nsim_rcv vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp -xsk: respect the offsets when copying frags -net/mlx5: E-switch, Fix error handling for enabling roce -net/mlx5e: Fix lock order in mlx5e_tx_reporter_ptpsq_unhealthy_recover -net/mlx5e: TC, Continue the attr process even if encap entry is invalid -net/mlx5: E-Switch, Initialize MAC Address for Default GID -net/mlx5e: Use custom tunnel header for vxlan gbp -net: ethtool: netlink: Use netdev_hold for dumpit() operations -net: ethtool: phy: Convert the PHY_GET command to generic phy dump -net: ethtool: Introduce per-PHY DUMP operations dt-bindings: net: pse-pd: ti,tps23881: Add interrupt description net: pse-pd: tps23881: Add support for static port priority feature dt-bindings: net: pse-pd: microchip,pd692x0: Add manager regulator supply @@ -45,4 +21,3 @@ net: pse-pd: Add support for PSE power domains net: pse-pd: tps23881: Add support for PSE events and interrupts net: pse-pd: Add support for reporting events net: ethtool: Add support for ethnl_info_init_ntf helper function -selftests: iou-zcrx: Get the page size at runtime