Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-11--08-00 (v6.18-rc4-969-g9afa57626964) remotes/brancher/net-next-hw-2025-11-11--16-00 (v6.18-rc4-934-gbd337dbe1cf8) ==== BASE DIFF ==== Documentation/netlink/specs/devlink.yaml | 2 + .../networking/devlink/devlink-eswitch-attr.rst | 13 + drivers/infiniband/hw/mlx5/cq.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/cq.c | 23 +- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 33 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - .../ethernet/mellanox/mlx5/core/esw/adj_vport.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 6 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 207 ++++++- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 116 +++- drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 9 + .../mellanox/mlx5/core/steering/hws/send.c | 7 - .../mellanox/mlx5/core/steering/sws/dr_send.c | 28 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 6 +- include/linux/mlx5/cq.h | 1 + include/linux/mlx5/fs.h | 1 + include/net/xdp_sock.h | 7 + include/uapi/linux/devlink.h | 1 + net/core/skbuff.c | 8 +- net/devlink/netlink_gen.c | 2 +- net/sched/act_connmark.c | 12 +- net/sched/act_ife.c | 12 +- net/unix/garbage.c | 14 +- net/xdp/xsk.c | 3 +- tools/net/ynl/Makefile | 3 +- tools/net/ynl/samples/page-pool.c | 149 ----- tools/net/ynl/ynltool/.gitignore | 1 + tools/net/ynl/ynltool/Makefile | 55 ++ tools/net/ynl/ynltool/json_writer.c | 288 ++++++++++ tools/net/ynl/ynltool/json_writer.h | 75 +++ tools/net/ynl/ynltool/main.c | 242 ++++++++ tools/net/ynl/ynltool/main.h | 66 +++ tools/net/ynl/ynltool/page-pool.c | 461 +++++++++++++++ tools/net/ynl/ynltool/qstats.c | 621 +++++++++++++++++++++ 38 files changed, 2263 insertions(+), 261 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.0tTO3EzTJQ b/tmp/tmp.yZbjrNQWu3 index 3b2521d5fe12..60b3cbb0c3f4 100644 --- a/tmp/tmp.0tTO3EzTJQ +++ b/tmp/tmp.yZbjrNQWu3 @@ -1,4 +1,5 @@ nipa: dbg: try to capture info about xdp qstat failures +nipa: fbnic: link up on QEMU nipa: config: disable kmemleak auto scan nipa: config: x86: disable GPUs and sound nipa: drv: net: add timeout @@ -12,6 +13,10 @@ nipa: profile (time) test output nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests +ipv4: route: Prevent rt_bind_exception() from rebinding stale fnhe +selftests/bpf: Add mptcp test with sockmap +net,mptcp: fix proto fallback detection with BPF +mptcp: disallow MPTCP subflows from sockmap ipv6: clear RA flags when adding a static route net: phy: fixed_phy: initialize the link status as up net: netcp: ethss: Fix type of first parameter in hwtstamp stubs @@ -53,64 +58,3 @@ net: ethernet: ti: am65-cpsw: add XSK pool helpers net: ethernet: ti: am65-cpsw: Retain page_pool on XDP program exchange net: ethernet: ti: am65-cpsw: fix BPF Program change on multi-port CPSW net_sched: limit try_bulk_dequeue_skb() batches -mlx5: Fix default values in create CQ -net/mlx5e: Fix potentially misleading debug message -net/mlx5e: Fix wraparound in rate limiting for values above 255 Gbps -net/mlx5e: Fix maxrate wraparound in threshold between units -net/mlx5e: Trim the length of the num_doorbell error -net/mlx5e: Fix missing error assignment in mlx5e_xfrm_add_state() -net: sched: act_ife: initialize struct tc_ife to fix KMSAN kernel-infoleak -net: sched: act_connmark: initialize struct tc_ife to fix kernel leak -af_unix: Initialise scc_index in unix_add_edge(). -selftests/vsock: disable shellcheck SC2317 and SC2119 -selftests/vsock: add vsock_loopback module loading -selftests/vsock: add 1.37 to tested virtme-ng versions -selftests/vsock: add BUILD=0 definition -selftests/vsock: identify and execute tests that can re-use VM -selftests/vsock: add check_result() for pass/fail counting -selftests/vsock: speed up tests by reducing the QEMU pidfile timeout -selftests/vsock: do not unconditionally die if qemu fails -selftests/vsock: avoid multi-VM pidfile collisions with QEMU -selftests/vsock: reuse logic for vsock_test through wrapper functions -selftests/vsock: make wait_for_listener() work even if pipefail is on -selftests/vsock: improve logging in vmtest.sh -net/mlx5: E-Switch, support eswitch inactive mode -net/mlx5: MPFS, add support for dynamic enable/disable -devlink: Introduce switchdev_inactive eswitch mode -tools: ynltool: add traffic distribution balance -tools: ynltool: add qstats support -tools: ynltool: add page-pool stats -tools: ynltool: create skeleton for the C command -virtio_net: Add get ethtool flow rules ops -virtio_net: Add support for TCP and UDP ethtool rules -virtio_net: Add support for IPv6 ethtool steering -virtio_net: Implement IPv4 ethtool flow rules -virtio_net: Use existing classifier if possible -virtio_net: Implement layer 2 ethtool flow rules -virtio_net: Create a FF group for ethtool steering -virtio_net: Query and set flow filter caps -virtio: Expose object create and destroy API -virtio: Expose generic device capability operations -virtio: Add config_op for admin commands -virtio_pci: Remove supported_cap size build assert -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 -dt-bindings: net: dp83822: Deprecate ti,fiber-mode -net: phy: dp83822: Add support for phy_port representation -net: phy: Introduce PHY ports representation -net: ethtool: Introduce ETHTOOL_LINK_MEDIUM_* values -dt-bindings: net: Introduce the ethernet-connector description -net/ipv6: fix lookup for ::/0 (non-)subtree route -net/ipv6: drop ip6_route_get_saddr -net/ipv6: use ipv6_fl_get_saddr in output -net/ipv6: create ipv6_fl_get_saddr -net/ipv6: flatten ip6_route_get_saddr -xsk: add indirect call for xsk_destruct_skb