Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-09-02--12-00 (v6.17-rc3-856-ga37b7407b995) remotes/brancher/net-next-2025-09-02--15-00 (v6.17-rc3-840-g7e80fbeda6a6) ==== 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 +- 29 files changed, 1935 insertions(+), 298 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.jACV5ymEJa b/tmp/tmp.Wpedpt4TJ0 index 922e10ea6da3..c2a713d26911 100644 --- a/tmp/tmp.jACV5ymEJa +++ b/tmp/tmp.Wpedpt4TJ0 @@ -12,8 +12,19 @@ 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 +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: 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/mlx5e: Make DEFAULT_FRAG_SIZE relative to page size +ax25: properly unshare skbs in ax25_kiss_rcv() +net: phy: micrel: Add PTP support for lan8842 +net: phy: micrel: Introduce function __lan8814_ptp_probe_once +phy: mscc: Stop taking ts_lock for tx_queue and use its own lock net: nfc: nci: Increase NCI_DATA_TIMEOUT to 3000 ms -netrom: fix out-of-bounds read in nr_rx_frame() mctp: return -ENOPROTOOPT for unknown getsockopt options dt-bindings: net: renesas,rzn1-gmac: Constrain interrupts dt-bindings: net: altr,socfpga-stmmac: Constrain interrupts @@ -35,7 +46,6 @@ 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: phy: marvell: Fix 88e1510 downshift counter errata 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 @@ -92,19 +102,10 @@ 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 @@ -152,46 +153,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 -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