Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-07-08--18-01 (v6.16-rc4-1283-gd9f77ef00875) remotes/brancher/net-next-2025-07-08--21-00 (v6.16-rc4-1286-g528f441c821f) ==== BASE DIFF ==== drivers/net/ethernet/intel/ice/ice_ethtool.c | 28 +---- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 27 ++-- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 8 +- .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 139 ++++++++++++--------- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 6 +- .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 3 +- .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 30 ++--- .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 7 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 135 +++++++++++++++----- include/linux/ethtool.h | 4 - net/core/dev.c | 15 +-- net/ethtool/ioctl.c | 93 ++++---------- net/ethtool/rss.c | 3 +- net/rxrpc/ar-internal.h | 15 ++- net/rxrpc/output.c | 5 +- 17 files changed, 259 insertions(+), 268 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.JrxBKXsICG b/tmp/tmp.Lb1V0ufkmm index 87bbb2b8753b..af87b9b82f06 100644 --- a/tmp/tmp.JrxBKXsICG +++ b/tmp/tmp.Lb1V0ufkmm @@ -8,6 +8,8 @@ tc_action dbg [local patch] forwarding: set timeout to 3 hours [local patch] selftests: net: enable profiling [local patch] timestamp - try waking [local patch] +Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux +net: thunderx: Fix format-truncation warning in bgx_acpi_match_id() net: stmmac: Support gpio high-level reset for devices requiring it selftests/tc-testing: Add tests for restrictions on netem duplication net/sched: Restrict conditions for adding duplicating netems to qdisc tree @@ -15,11 +17,7 @@ devlink: move DEVLINK_ATTR_MAX-sized array off stack virtio-net: fix received length check in big packets net: bonding: add bond_is_icmpv6_nd() helper net: selftests: add PHY-loopback test for bad TCP checksums -selftests: ethtool: Introduce ethernet PHY selftests on netdevsim -selftests: ethtool: Drop the unused old_netdevs variable -net: netdevsim: Add PHY support in netdevsim vsock/test: fix test for null ptr deref when transport changes -net: ti: icssg-prueth: Fix buffer allocation for ICSSG net: phy: bcm54811: PHY initialization net: phy: bcm5481x: MII-Lite activation dt-bindings: ethernet-phy: add MII-Lite phy interface type @@ -47,16 +45,9 @@ selftests/net: packetdrill: add tcp_ooo-before-and-after-accept.pkt tcp: refine sk_rcvbuf increase for ooo packets net/sched: Abort __tc_modify_qdisc if parent class does not exist gve: make IRQ handlers and page allocation NUMA aware -net: ethtool: reduce indent for _rxfh_context ops -net: ethtool: remove the compat code for _rxfh_context ops -eth: mlx5: migrate to the *_rxfh_context ops -eth: ice: drop the dead code related to rss_contexts -eth: otx2: migrate to the *_rxfh_context ops af_key: Add check for the return value of pfkey_sadb2xfrm_user_sec_ctx() net: phy: micrel: Add callback for restoring context tcp: extend tcp_retransmit_skb tracepoint with failure reasons   -rxrpc: Fix bug due to prealloc collision -rxrpc: Fix over large frame size warning udp: remove udp_tunnel_gro_init() net: ethernet: ti: am65-cpsw-nuss: Fix skb size by accounting for skb_shared_info net: thunderx: avoid direct MTU assignment after WRITE_ONCE() @@ -168,3 +159,8 @@ net: ti: prueth: Adds link detection, RX and TX support. net: ti: prueth: Adds PRUETH HW and SW configuration net: ti: prueth: Adds ICSSM Ethernet driver dt-bindings: net: ti: Adds DUAL-EMAC mode support on PRU-ICSS2 for AM57xx, AM43xx and AM33xx SOCs +net/mlx5: Check device memory pointer before usage +net/mlx5: fs, fix RDMA TRANSPORT init cleanup flow +net/mlx5: Add IFC bits for PCIe Congestion Event object +net/mlx5: Small refactor for general object capabilities +net/mlx5: fs, add multiple prios to RDMA TRANSPORT steering domain