Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-10-30--09-00 (v6.18-rc2-675-gefda7eaa20ee) remotes/brancher/net-next-2025-10-30--12-00 (v6.18-rc2-683-g609bcfe26e05) ==== BASE DIFF ==== drivers/net/ethernet/marvell/octeontx2/af/Makefile | 3 +- .../ethernet/marvell/octeontx2/af/cn20k/debugfs.c | 218 +++++++++++++ .../ethernet/marvell/octeontx2/af/cn20k/debugfs.h | 28 ++ .../net/ethernet/marvell/octeontx2/af/cn20k/nix.c | 20 ++ .../net/ethernet/marvell/octeontx2/af/cn20k/npa.c | 21 ++ .../ethernet/marvell/octeontx2/af/cn20k/struct.h | 340 +++++++++++++++++++++ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 73 +++++ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 15 +- .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 39 ++- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 76 +++-- .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 29 +- .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 31 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 10 + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 220 ++++++++++++- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 10 + net/sctp/input.c | 2 +- 17 files changed, 1093 insertions(+), 56 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.xTDdhv9nqQ b/tmp/tmp.hjbVUlsB8S index eb128a15e3ba..cff02555278c 100644 --- a/tmp/tmp.xTDdhv9nqQ +++ b/tmp/tmp.hjbVUlsB8S @@ -12,6 +12,16 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests nipa: fbnic: link up on QEMU +net: stmmac: qcom-ethqos: remove MAC_CTRL_REG modification +net: enetc: add port MDIO support for ENETC v4 +net: enetc: set external MDIO PHY address for i.MX94 ENETC +net: enetc: set external MDIO PHY address for i.MX95 ENETC +amd-xgbe: add ethtool jumbo frame selftest +amd-xgbe: add ethtool split header selftest +amd-xgbe: add ethtool phy selftest +amd-xgbe: introduce support ethtool selftest +net: selftests: export packet creation helpers for driver use +treewide: Rename ERR_PTR_PCPU() --> PCPU_ERR_PTR() net: phy: micrel: lan8842 errata net: phy: micrel: lan8842 errata Documentation: netconsole: Separate literal code blocks for full and short netcat command name versions @@ -77,7 +87,6 @@ net: build socket infrastructure for QUIC protocol net: define IPPROTO_QUIC and SOL_QUIC constants net: mana: Add standard counter rx_missed_errors net: mana: Refactor GF stats to use global mana_context -net: stmmac: qcom-ethqos: remove MAC_CTRL_REG modification ptp: Allow exposing cycles only for clocks with free-running counter selftests: net: add YNL test framework netlink: specs: update rt-rule src/dst attribute types to support IPv4 addresses @@ -113,21 +122,7 @@ net/smc: handle -ENOMEM from smc_wr_alloc_link_mem gracefully net/smc: make wr buffer count configurable veth: more robust handing of race to avoid txq getting stuck veth: enable dev_watchdog for detecting stalled TXQs -net: dsa: tag_brcm: legacy: fix untagged rx on unbridged ports for bcm63xx net: phy: dp83td510: add MSE interface support for 10BASE-T1L net: phy: micrel: add MSE interface support for KSZ9477 family ethtool: netlink: add ETHTOOL_MSG_MSE_GET and wire up PHY MSE access net: phy: introduce internal API for PHY MSE diagnostics -net: sctp: fix KMSAN uninit-value in sctp_inq_pop -xsk: add indirect call for xsk_destruct_skb -octeontx2-pf: Use new bandwidth profiles in receive queue -octeontx2-af: Display new bandwidth profiles too in debugfs -octeontx2-af: Accommodate more bandwidth profiles for cn20k -octeontx2-pf: Initialize new NIX SQ context for cn20k -octeontx2-pf: Initialize cn20k specific aura and pool contexts -octeontx2-af: Skip NDC operations for cn20k -octeontx2-af: Extend debugfs support for cn20k NPA -octeontx2-af: Add cn20k NPA block contexts -octeontx2-af: Extend debugfs support for cn20k NIX -octeontx2-af: Add cn20k NIX block contexts -octeontx2-af: Simplify context writing and reading to hardware