Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-05-22--08-00 (v6.15-rc6-1442-g15c931db9ddf) remotes/brancher/net-next-hw-2025-05-22--16-00 (v6.15-rc6-1437-ged321e63c0e7) ==== BASE DIFF ==== Documentation/netlink/specs/ethtool.yaml | 27 +++ drivers/net/can/kvaser_pciefd.c | 182 ++++++++++++--------- drivers/net/can/slcan/slcan-core.c | 26 ++- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 +- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 24 ++- .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 11 +- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 9 +- include/linux/ethtool.h | 5 + include/linux/net_tstamp.h | 7 +- include/net/xfrm.h | 1 - include/uapi/linux/ethtool_netlink_generated.h | 14 ++ net/ethtool/common.c | 29 +++- net/ethtool/tsinfo.c | 23 +++ net/ipv4/esp4.c | 53 +----- net/ipv4/xfrm4_input.c | 18 +- net/ipv6/esp6.c | 53 +----- net/ipv6/xfrm6_input.c | 18 +- net/sched/sch_hfsc.c | 6 +- net/tipc/crypto.c | 5 + net/xfrm/espintcp.c | 4 +- net/xfrm/xfrm_ipcomp.c | 3 +- net/xfrm/xfrm_policy.c | 3 + net/xfrm/xfrm_state.c | 6 +- .../tc-testing/tc-tests/infra/qdiscs.json | 27 +++ 24 files changed, 330 insertions(+), 228 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.TdyFoILcPN b/tmp/tmp.Xjm9jFgBmb index 61f78f4704e2..2d8ebe4b8684 100644 --- a/tmp/tmp.TdyFoILcPN +++ b/tmp/tmp.Xjm9jFgBmb @@ -24,14 +24,6 @@ net/mlx5e: Don't drop RTNL during firmware flash IB/IPoIB: Allow using netdevs that require the instance lock IB/IPoIB: Replace vlan_rwsem with the netdev instance lock IB/IPoIB: Enqueue separate work_structs for each flushed interface -net: ena: Add a DEVLINK readme -net: ena: Add PHC documentation -net: ena: View PHC stats using debugfs -net: ena: Add debugfs support to the ENA driver -net: ena: Control PHC enable through devlink -net: ena: Add device reload capability through devlink -net: ena: PHC silent reset -net: ena: Add PHC support in the ENA driver octeontx2-af: Send Link events one by one hv_netvsc: fix potential deadlock in netvsc_vf_setxdp() net: mctp: use nlmsg_payload() for netlink message data extraction @@ -48,13 +40,6 @@ net: txgbe: Implement PHYLINK for AML 25G/10G devices net: txgbe: Distinguish between 40G and 25G devices net: wangxun: Use specific flag bit to simplify the code net: txgbe: Remove specified SP type -octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG -octeontx2-af: Set LMT_ENA bit for APR table entries -xfrm: Sanitize marks before insert -xfrm: ipcomp: fix truesize computation on receive -xfrm: Fix UDP GRO handling for some corner cases -espintcp: remove encap socket caching to avoid reference leak -espintcp: fix skb leaks net: neigh: use kfree_skb_reason() in neigh_resolve_output() and neigh_connected_output() net: dsa: microchip: Add SGMII port support to KSZ9477 switch libeth: xdp, xsk: access adjacent u32s as u64 where applicable @@ -76,13 +61,10 @@ libeth: convert to netmem selftests: ncdevmem: add tx test with multiple IOVs selftests: ncdevmem: make chunking optional net: devmem: support single IOV with sendmsg -net: enetc: fix NTMP build dependency ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use() net: ethernet: mtk_eth_soc: Correct spelling net: dlink: Correct endian treatment of t_SROM data net: usb: aqc111: fix error handling of usbnet read calls -net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done -eth: bnxt: fix deadlock when xdp is attached or detached octeontx2-af: NPC: Clear Unicast rule on nixlf detach selftest: af_unix: Test SO_PASSRIGHTS. af_unix: Introduce SO_PASSRIGHTS. @@ -93,13 +75,4 @@ tcp: Restrict SO_TXREHASH to TCP socket. scm: Move scm_recv() from scm.h to scm.c. af_unix: Don't pass struct socket to maybe_add_creds(). af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD. -net: mana: Add support for Multi Vports on Bare metal -net: Add support for providing the PTP hardware source in tsinfo -net: bonding: add tracepoint for 802.3ad -net: bonding: send peer notify when failure recovery -net: bonding: add broadcast_neighbor netlink option -net: bonding: add broadcast_neighbor option for 802.3ad -octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf -selftests/tc-testing: Add an HFSC qlen accounting test -sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() net: phy: move mdiobus_setup_mdiodev_from_board_info to mdio_bus_provider.c