Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-09-02--08-00 (v6.17-rc3-836-ge3cc70789c72) remotes/brancher/net-next-hw-2025-09-02--16-00 (v6.17-rc3-827-gcbc7e8cea836) ==== BASE DIFF ==== .../bindings/net/ethernet-controller.yaml | 5 + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 4 - .../devicetree/bindings/ptp/nxp,ptp-netc.yaml | 63 ++ MAINTAINERS | 9 + drivers/net/ethernet/freescale/enetc/Kconfig | 3 + drivers/net/ethernet/freescale/enetc/enetc.c | 209 ++-- drivers/net/ethernet/freescale/enetc/enetc.h | 21 +- drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 6 + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 3 + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 91 +- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- .../ethernet/mellanox/mlx5/core/esw/adj_vport.c | 209 ++++ .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 131 ++- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 17 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 37 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 183 ++-- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 18 +- .../ethernet/mellanox/mlx5/core/steering/hws/cmd.c | 34 +- .../mellanox/mlx5/core/steering/sws/dr_cmd.c | 34 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/mctp/mctp-usb.c | 1 + drivers/ptp/Kconfig | 11 + drivers/ptp/Makefile | 1 + drivers/ptp/ptp_clock.c | 53 + drivers/ptp/ptp_netc.c | 1017 ++++++++++++++++++++ include/linux/ptp_clock_kernel.h | 22 + net/mctp/route.c | 35 +- net/smc/smc_ib.c | 3 + 30 files changed, 1938 insertions(+), 298 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.KLQxKdkfJJ b/tmp/tmp.aABpv8Odp4 index 719f76c14ca0..bc126f455ba4 100644 --- a/tmp/tmp.KLQxKdkfJJ +++ b/tmp/tmp.aABpv8Odp4 @@ -13,6 +13,27 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: dbg net/sctp_vrf.sh nipa: disable random kunit tests +net: nfc: nci: Increase NCI_DATA_TIMEOUT to 3000 ms +mctp: return -ENOPROTOOPT for unknown getsockopt options +ovpn: use kmalloc_array() for array space allocation +net/smc: Remove validation of reserved bits in CLC Decline message +netdev queue flow control for vhost_net +netdev queue flow control for TAP +netdev queue flow control for TUN +ptr_ring_spare: Helper to check if spare capacity of size cnt is available +selftests/net: add offload checking test for virtual interface +net: bridge: use common function to compute the features +team: use common function to compute the features +bonding: use common function to compute the features +net: add a common function to compute features from lowers devices +net: intel: fm10k: Fix parameter idx set but not used +hsr: use netdev_master_upper_dev_link() when linking lower ports +selftests: bonding: add test for LACP actor port priority +bonding: support aggregator selection based on port priority +bonding: add support for per-port LACP actor priority +ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init() +net/cls_cgroup: Fix task_get_classid() during qdisc run +net: libwx: fix to enable RSS net/core: Replace offensive comment in skbuff.c net: xilinx: axienet: Add error handling for RX metadata pointer retrieval ixgbe: fix too early devlink_free() in ixgbe_remove() @@ -53,7 +74,6 @@ net: gso: restore ids of outer ip headers correctly net: gro: only merge packets with incrementing or fixed outer ids net: gro: remove is_ipv6 from napi_gro_cb ipv6: sit: Add ipip6_tunnel_dst_find() for cleanup -ovpn: use kmalloc_array() for array space allocation net: pcs: rzn1-miic: Correct MODCTRL register offset net: ti: icssg-prueth: Enable zero copy in XDP features net: ti: icssg-prueth: Add AF_XDP zero copy for RX @@ -69,23 +89,15 @@ selftests: mptcp: remove add_addr_timeout settings mptcp: make ADD_ADDR retransmission timeout adaptive mptcp: use HMAC-SHA256 library instead of open-coded HMAC net_sched: act: remove tcfa_qstats -phy: mscc: Stop taking ts_lock for tx_queue and use its own lock net_sched: add back BH safety to tcf_lock ARM: dts: stm32: add missing PTP reference clocks on stm32mp13x SoCs drivers: net: stmmac: handle start time set in the past for flexible PPS time: export timespec64_add_safe() symbol -netfilter: nft_payload: extend offset to 65535 bytes -netfilter: nf_reject: remove unneeded exports -netfilter: nft_set_pipapo: remove redundant test for avx feature bit -netfilter: nf_tables: Introduce NFTA_DEVICE_PREFIX -netfilter: nf_tables: all transaction allocations can now sleep -netfilter: nf_tables: allow iter callbacks to sleep -netfilter: nft_payload: Use csum_replace4() instead of opencoding -netfilter: ebtables: Use vmalloc_array() to improve code net: dsa: mv88e6xxx: Fix fwnode reference leaks in mv88e6xxx_port_setup_leds selftests: net: Add a selftest for VXLAN with FDB nexthop groups vxlan: Fix NPD in {arp,neigh}_reduce() when using nexthop objects vxlan: Fix NPD when refreshing an FDB entry with a nexthop object +net: atm: fix memory leak in atm_register_sysfs when device_register fail selftests: net: avoid memory leak net: renesas: rswitch: add modifiable ageing time net: renesas: rswitch: add offloading for L2 switching @@ -128,51 +140,3 @@ net: dsa: lantiq_gswip: ignore SerDes modes in phylink_mac_config() net: dsa: lantiq_gswip: support model-specific mac_select_pcs() net: dsa: lantiq_gswip: move to dedicated folder bonding: Remove support for use_carrier -net/mlx5: {DR,HWS}, Use the cached vhca_id for this device -net/mlx5: E-switch, Set representor attributes for adjacent VFs -net/mlx5: E-Switch, Register representors for adjacent vports -net/mlx5: E-Switch, Create acls root namespace for adjacent vports -net/mlx5: E-Switch, Add support for adjacent functions vports discovery -net/mlx5: E-Switch, Move vport acls root namespaces creation to eswitch -net/mlx5: FS, Convert vport acls root namespaces to xarray -net: ethernet: ti: am65-cpsw-nuss: Fix null pointer dereference for ndev -net: mctp: usb: initialise mac header in RX path -net: mctp: mctp_fraq_queue should take ownership of passed skb -net: enetc: don't update sync packet checksum if checksum offload is used -net: enetc: add PTP synchronization support for ENETC v4 -net: enetc: move sync packet modification before dma_map_single() -net: enetc: remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check -net: enetc: extract enetc_update_ptp_sync_msg() to handle PTP Sync packets -net: enetc: save the parsed information of PTP packet to skb->cb -MAINTAINERS: add NETC Timer PTP clock driver section -ptp: netc: add external trigger stamp support -ptp: netc: add periodic pulse output support -ptp: netc: add PTP_CLK_REQ_PPS support -ptp: netc: add NETC V4 Timer PTP driver support -ptp: add helpers to get the phc_index by of_node or dev -dt-bindings: net: move ptp-timer property to ethernet-controller.yaml -dt-bindings: ptp: add NETC Timer PTP clock -selftests: Add napi threaded busy poll test in `busy_poller` -Extend napi threaded polling to allow kthread based busy polling -net: phy: fixed_phy: remove link gpio support -net/mlx5e: Implement PSP key_rotate operation -net/mlx5e: Add Rx data path offload -psp: provide decapsulation and receive helper for drivers -net/mlx5e: Configure PSP Rx flow steering rules -net/mlx5e: Add PSP steering in local NIC RX -net/mlx5e: Implement PSP Tx data path -psp: provide encapsulation helper for drivers -net/mlx5e: Implement PSP operations .assoc_add and .assoc_del -net/mlx5e: Support PSP offload functionality -psp: track generations of device key -net: psp: update the TCP MSS to reflect PSP packet overhead -net: psp: add socket security association code -net: tcp: allow tcp_timewait_sock to validate skbs before handing to device -net: move sk_validate_xmit_skb() to net/core/dev.c -psp: add op for rotation of device key -tcp: add datapath logic for PSP with inline key exchange -net: modify core data structures for PSP datapath support -psp: base PSP device support -psp: add documentation -net/smc: fix one NULL pointer dereference in smc_ib_is_sg_need_sync() -net: usb: r8152: resume-reset deadlock