Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-25--00-00 (v6.15-rc3-682-g370c3d0a3b9f) remotes/brancher/net-next-2025-04-25--03-00 (v6.15-rc3-644-gb39f0bb277e4) ==== 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.2UBMTKbpTH b/tmp/tmp.a22oMut7TN index a94241aa3db0..9d32311c787d 100644 --- a/tmp/tmp.2UBMTKbpTH +++ b/tmp/tmp.a22oMut7TN @@ -8,6 +8,13 @@ profile patch forwarding: set timeout to 3 hours selftests: net: bridge_vlan_aware: test untagged/8021p-tagged with and without PVID net: mscc: ocelot: delete PVID VLAN when readding it as non-PVID +netfilter: nf_tables: export set count and backend name to userspace +docs: tproxy: fix formatting for nft code block +netfilter: conntrack: Remove redundant NFCT_ALIGN call +netfilter: Exclude LEGACY TABLES on PREEMPT_RT. +net: cgroup: Guard users of sock_cgroup_classid() +netfilter: xt_cgroup: Make it independent from net_cls +netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies() Revert "rndis_host: Flag RNDIS modems as WWAN devices" selftests/net: test tcp connection load balancing ip: load balance tcp connections to single dst addr and port @@ -24,91 +31,15 @@ net: stmmac: dwmac-loongson: Move queue number init to common function net: stmmac: socfpga: Remove unused pcs-mdiodev field net: stmmac: socfpga: Don't check for phy to enable the SGMII adapter net: stmmac: socfpga: Enable internal GMII when using 1000BaseX -rtase: Modify the format specifier in snprintf to %u. 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 -tools: ynl: fix the header guard name for OVPN -mctp pcc: Implement MCTP over PCC Transport -net: rds: Replace strncpy with strscpy in connection setup -tests/ncdevmem: Fix double-free of queue array -net/devmem: Reject insufficiently large dmabuf pools -net: ethernet: mtk_wed: annotate RCU release in attach() vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp leds: trigger: netdev: refactor dev matching in netdev_trig_notify() -tcp: fastopen: pass TFO child indication through getsockopt -tcp: fastopen: note that a child socket was created -hinic3: module initialization and tx/rx logic -net: ip_gre: Fix spelling mistake "demultiplexor" -> "demultiplexer" -xsc: add ndo_get_stats64 -xsc: Add eth reception data path -xsc: Add ndo_start_xmit -xsc: ndo_open and ndo_stop -xsc: Add eth needed qp and cq apis -xsc: Init net device -xsc: Add ethernet interface -xsc: Init auxiliary device -xsc: Init pci irq -xsc: Add eq and alloc -xsc: Add qp and cq management -xsc: Add hardware setup APIs -xsc: Enable command queue -xsc: Add xsc driver basic framework -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 -rxrpc: rxgk: Fix some reference count leaks net: vertexcom: mse102x: Fix RX error handling net: vertexcom: mse102x: Add range check for CMD_RTS net: vertexcom: mse102x: Fix LEN_MASK dt-bindings: vertexcom-mse102x: Fix IRQ type in example net: vertexcom: mse102x: Fix possible stuck of SPI interrupt -cxgb4: Return an error code only as a constant in cxgb4_init_ethtool_filters() -net: ethernet: mtk_eth_soc: convert cap_bit in mtk_eth_muxc struct to u64 -rxrpc: Remove deadcode -net: phy: mdio-bcm-unimac: Add asp-v3.0 -net: bcmasp: Add support for asp-v3.0 -dt-bindings: net: brcm,unimac-mdio: Add asp-v3.0 -dt-bindings: net: brcm,asp-v2.0: Add asp-v3.0 -net: phy: mdio-bcm-unimac: Remove asp-v2.0 -net: bcmasp: Remove support for asp-v2.0 -dt-bindings: net: brcm,unimac-mdio: Remove asp-v2.0 -dt-bindings: net: brcm,asp-v2.0: Remove asp-v2.0 -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 -tcp: try to avoid safer when ACKs are thinned -tcp: accecn: try to fit AccECN option with SACK -tcp: accecn: AccECN ACE field multi-wrap heuristic -tcp: accecn: AccECN option ceb/cep heuristic -tcp: accecn: AccECN option failure handling -tcp: accecn: AccECN option send control -tcp: accecn: AccECN option -tcp: sack option handling improvements -tcp: allow embedding leftover into option padding -tcp: accecn: AccECN needs to know delivered bytes -tcp: accecn: add AccECN rx byte counters -tcp: accecn: AccECN negotiation -tcp: AccECN core -tcp: fast path functions later -tcp: reorganize SYN ECN code 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 @@ -122,4 +53,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