Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-18--09-00 (v6.14-rc2-652-g51bedabef8fc) remotes/brancher/net-next-2025-02-18--12-00 (v6.14-rc2-656-gbbb38b4cadf8) ==== BASE DIFF ==== .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 7 +- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 122 ++++++++--- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 17 +- .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 6 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 32 +-- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 188 +++++++++++++---- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 9 + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 12 +- .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.c | 225 +++++++++++++++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.h | 24 +++ .../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 2 +- net/core/page_pool.c | 8 +- net/core/sock_map.c | 3 + net/vmw_vsock/af_vsock.c | 3 + net/vmw_vsock/vsock_bpf.c | 2 +- .../selftests/bpf/prog_tests/sockmap_basic.c | 70 +++++-- 17 files changed, 620 insertions(+), 112 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.GEhx1YZ5F2 b/tmp/tmp.qLtaet91CZ index 7cc3d796add2..22db33f12a36 100644 --- a/tmp/tmp.GEhx1YZ5F2 +++ b/tmp/tmp.qLtaet91CZ @@ -3,6 +3,10 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +tcp: Fix error ts_recent time during three-way handshake +net: stmmac: "speed" passed to fix_mac_speed is an int +net: stmmac: remove useless priv->flow_ctrl +net: stmmac: clarify priv->pause and pause module parameter sctp: Fix undefined behavior in left shift operation selftests/bpf: Add a specific dst port matching flow_dissector: Fix port range key handling in BPF conversion @@ -56,12 +60,6 @@ testptp: add option to open PHC in readonly mode ptp: Add file permission checks on PHCs posix-clock: Store file pointer in struct posix_clock_context net: ethernet: mediatek: add EEE support -octeontx2-pf: CN20K mbox implementation between PF-VF -octeontx2-af: CN20K mbox implementation for AF's VF -octeontx2-pf: CN20K mbox REQ/ACK implementation for NIC PF -octeontx2-af: CN20k mbox to support AF REQ/ACK functionality -octeontx2-af: CN20k basic mbox operations and structures -octeontx2: Set appropriate PF, VF masks and shifts based on silicon dt-bindings: net: dsa: b53: add BCM53101 support net: dsa: b53: mdio: add support for BCM53101 net: ethernet: ti am65_cpsw: Drop separate TX completion functions @@ -109,13 +107,6 @@ selftests: test_vxlan_fdb_changelink: Convert to lib.sh selftests: forwarding: lib: Move require_command to net, generalize vxlan: Join / leave MC group after remote changes vxlan: Drop 'changelink' parameter from vxlan_dev_configure() -devlink: fix xa_alloc_cyclic error handling -Documentation: net: phy: Elaborate on RGMII delay handling -page_pool: avoid infinite loop to schedule delayed worker -selftest/bpf: Add vsock test for sockmap rejecting unconnected -selftest/bpf: Adapt vsock_delete_on_close to sockmap rejecting unconnected -vsock/bpf: Warn on socket without transport -sockmap, vsock: For connectible sockets allow only connected eth: mlx4: use the page pool for Rx buffers eth: mlx4: remove the local XDP fast-recycling ring eth: mlx4: don't try to complete XDP frames in netpoll