Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-11--12-00 (v6.18-rc4-963-gaf201e1a5f66) remotes/brancher/net-next-2025-11-11--15-00 (v6.18-rc4-955-g3a4bca75f48b) ==== 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/uapi/linux/devlink.h | 1 + net/devlink/netlink_gen.c | 2 +- net/sched/act_connmark.c | 12 +- net/sched/act_ife.c | 12 +- net/unix/garbage.c | 14 +- 25 files changed, 438 insertions(+), 107 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.aDNYxttyK7 b/tmp/tmp.LuA40T4BeW index e74a86bc56fa..0cf36dc014c7 100644 --- a/tmp/tmp.aDNYxttyK7 +++ b/tmp/tmp.LuA40T4BeW @@ -11,6 +11,7 @@ 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 +devlink: rate: Unset parent pointer in devl_rate_nodes_destroy virtio-net: correct hdr_len handling for tunnel gso virtio-net: correct hdr_len handling for VIRTIO_NET_F_GUEST_HDRLEN net: stmmac: Disable EEE RX clock stop when VLAN is enabled @@ -78,27 +79,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