Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-09-16--08-00 (v6.17-rc5-1271-gcb52063e1ce0) remotes/brancher/net-next-hw-2025-09-16--16-00 (v6.17-rc5-1246-gbb5a45686038) ==== BASE DIFF ==== .../devicetree/bindings/net/spacemit,k1-emac.yaml | 81 + Documentation/netlink/genetlink-legacy.yaml | 2 +- arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 48 + arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 48 + arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 48 + arch/riscv/boot/dts/spacemit/k1.dtsi | 22 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/huawei/hinic3/Makefile | 2 + drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c | 168 ++ drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h | 4 + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.c | 363 ++++ .../net/ethernet/huawei/hinic3/hinic3_hw_comm.h | 21 + .../net/ethernet/huawei/hinic3/hinic3_hw_intf.h | 115 ++ drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c | 541 ++++- drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c | 269 +++ drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h | 16 + drivers/net/ethernet/huawei/hinic3/hinic3_irq.c | 2 +- drivers/net/ethernet/huawei/hinic3/hinic3_lld.c | 9 +- drivers/net/ethernet/huawei/hinic3/hinic3_main.c | 8 +- drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c | 21 + drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h | 2 + .../ethernet/huawei/hinic3/hinic3_mgmt_interface.h | 119 ++ .../net/ethernet/huawei/hinic3/hinic3_netdev_ops.c | 426 +++- .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.c | 152 ++ .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.h | 20 + .../net/ethernet/huawei/hinic3/hinic3_nic_dev.h | 5 + drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c | 870 +++++++- drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.h | 39 +- .../net/ethernet/huawei/hinic3/hinic3_pci_id_tbl.h | 9 + drivers/net/ethernet/huawei/hinic3/hinic3_rss.c | 336 +++ drivers/net/ethernet/huawei/hinic3/hinic3_rss.h | 14 + drivers/net/ethernet/huawei/hinic3/hinic3_rx.c | 226 +- drivers/net/ethernet/huawei/hinic3/hinic3_rx.h | 38 +- drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 184 +- drivers/net/ethernet/huawei/hinic3/hinic3_tx.h | 30 +- drivers/net/ethernet/spacemit/Kconfig | 29 + drivers/net/ethernet/spacemit/Makefile | 6 + drivers/net/ethernet/spacemit/k1_emac.c | 2159 ++++++++++++++++++++ drivers/net/ethernet/spacemit/k1_emac.h | 416 ++++ drivers/net/phy/nxp-c45-tja11xx-macsec.c | 8 +- tools/net/ynl/lib/ynl-priv.h | 10 +- tools/net/ynl/lib/ynl.c | 6 +- tools/net/ynl/pyynl/lib/ynl.py | 38 +- tools/net/ynl/pyynl/ynl_gen_c.py | 96 +- 45 files changed, 6886 insertions(+), 142 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.ZemQGYxd0W b/tmp/tmp.WtQfwW0Gvm index 63de7dfb128d..b900dd3df018 100644 --- a/tmp/tmp.ZemQGYxd0W +++ b/tmp/tmp.WtQfwW0Gvm @@ -15,8 +15,6 @@ nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests Revert "net: ethernet: stmmac: dwmac-rk: Make the clk_phy could be used for external phy" MAINTAINERS: make the DPLL entry cover drivers -net/mlx5e: RX, Fix generating skb from non-linear xdp_buff for striding RQ -net/mlx5e: RX, Fix generating skb from non-linear xdp_buff for legacy RQ selftest: packetdrill: Add tcp_fastopen_server_reset-after-disconnect.pkt. tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect(). net: pse-pd: pd692x0: Add devlink interface for configuration save/reset @@ -24,9 +22,6 @@ devlink: Add devlink-conf uAPI for NV memory management docs: devlink: Sort table of contents alphabetically net: pse-pd: pd692x0: Separate configuration parsing from hardware setup net: pse-pd: pd692x0: Replace __free macro with explicit kfree calls -tools: ynl: avoid "use of uninitialized variable" false positive in generated code -ptp: rework ptp_clock_unregister() to disable events -ptp: describe the two disables in ptp_set_pinfunc() net: dsa: mv88e6xxx: move mv88e6xxx_hwtstamp_work() prototype net: dsa: mv88e6xxx: remove unused 88E6165 register definitions net: dsa: mv88e6xxx: remove duplicated register definition @@ -56,59 +51,4 @@ net: stmmac: est: Drop frames causing HLBS error net: stmmac: Consider Tx VLAN offload tag length for maxSDU net: stmmac: est: Fix GCL bounds checks phy: mscc: Fix PTP for vsc8574 and VSC8572 -net: mana: Add standard counter rx_missed_errors -net: mana: Refactor GF stats to use global mana_context -bnxt_en: Implement ethtool .set_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Implement ethtool .get_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Use VLAN_ETH_HLEN when possible -bnxt_en: Support for RoCE resources dynamically shared within VFs. -bnxt_en: Add err_qpc backing store handling -bnxt_en: Add fw log trace support for 5731X/5741X chips -bnxt_en: Improve bnxt_backing_store_cfg_v2() -bnxt_en: Improve bnxt_hwrm_func_backing_store_cfg_v2() -bnxt_en: Optimize bnxt_sriov_disable() -bnxt_en: Remove unnecessary VF check in bnxt_hwrm_nvm_req() -bnxt_en: Drop redundant if block in bnxt_dl_flash_update() -riscv: dts: spacemit: Add Ethernet support for Jupiter -riscv: dts: spacemit: Add Ethernet support for BPI-F3 -riscv: dts: spacemit: Add Ethernet support for K1 -net: spacemit: Add K1 Ethernet MAC -dt-bindings: net: Add support for SpacemiT K1 -net: phy: remove mdio_board_info support from phylib -net: dsa: dsa_loop: remove usage of mdio_board_info -net: phy: nxp-c45-tja11xx: use bitmap_empty() where appropriate doc/netlink: Fix typos in operation attributes -selftests/net: Test tcp port reuse after unbinding a socket -tcp: Update bind bucket state on port release -net: ovpn: use new noref xmit flow in ovpn_udp4_output -net: tunnel: implement noref flows in udp_tunnel_xmit_skb -net: dst_cache: implement RCU variants for dst_cache helpers -hinic3: Fix code style (Missing a blank line before return) -hinic3: Fix missing napi->dev in netif_queue_set_napi -hinic3: Add port management -hinic3: Add Rss function -hinic3: Tx & Rx configuration -hinic3: Queue pair context initialization -hinic3: Queue pair resource initialization -hinic3: Queue pair endianness improvements -hinic3: Nic_io initialization -hinic3: Command Queue flush interfaces -hinic3: HW capability initialization -hinic3: HW common function initialization -hinic3: HW management interfaces -hinic3: HW initialization -dibs: Move event handling to dibs layer -dibs: Move data path to dibs layer -dibs: Move query_remote_gid() to dibs_dev_ops -dibs: Move vlan support to dibs_dev_ops -dibs: Local gid for dibs devices -dibs: Create class dibs -dibs: Move struct device to dibs_dev -dibs: Define dibs_client_ops and dibs_dev_ops -dibs: Define dibs loopback -dibs: Register ism as dibs device -dibs: Register smc as dibs_client -dibs: Create drivers/dibs -net/smc: Decouple sf and attached send_buf in smc_loopback -net/smc: Remove error handling of unregister_dmb() -eth: fbnic: support devmem Tx