Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-27--08-00 (v6.18-rc6-1508-g44f978374023) remotes/brancher/net-next-hw-2025-11-27--16-00 (v6.18-rc6-1536-g79e23f92ff29) ==== BASE DIFF ==== .../bindings/net/can/microchip,mpfs-can.yaml | 5 + MAINTAINERS | 8 +- drivers/net/can/Kconfig | 17 ++ drivers/net/can/Makefile | 1 + drivers/net/can/dev/bittiming.c | 63 ++++ drivers/net/can/dev/calc_bittiming.c | 114 ++++++-- drivers/net/can/dev/dev.c | 42 ++- drivers/net/can/dev/netlink.c | 319 +++++++++++++++++++-- drivers/net/can/dummy_can.c | 285 ++++++++++++++++++ drivers/net/can/rcar/rcar_canfd.c | 246 +++++++++++----- drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/freescale/fec_ptp.c | 64 ++++- drivers/net/ethernet/meta/Kconfig | 1 + drivers/net/ethernet/meta/fbnic/Makefile | 1 + drivers/net/ethernet/meta/fbnic/fbnic.h | 15 +- drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 2 + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 9 + drivers/net/ethernet/meta/fbnic/fbnic_irq.c | 34 +-- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 81 ++++-- drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 41 ++- drivers/net/ethernet/meta/fbnic/fbnic_mdio.c | 195 +++++++++++++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 11 +- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 6 +- drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 9 +- drivers/net/ethernet/meta/fbnic/fbnic_phylink.c | 184 +++++++----- .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 5 +- drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 5 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 + drivers/net/pcs/pcs-xpcs.c | 136 ++++++++- drivers/net/phy/phy-c45.c | 8 +- include/linux/can/bittiming.h | 81 +++++- include/linux/can/dev.h | 68 +++-- include/linux/pcs/pcs-xpcs.h | 4 +- include/uapi/linux/can/netlink.h | 34 +++ include/uapi/linux/mdio.h | 23 +- net/can/raw.c | 54 +++- net/mctp/route.c | 1 + net/mptcp/protocol.c | 6 + .../testing/selftests/net/af_unix/unix_connreset.c | 1 - 41 files changed, 1853 insertions(+), 333 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.jXT5pERcKs b/tmp/tmp.WbdgGInmIr index 775205ebb188..25db3a1e4079 100644 --- a/tmp/tmp.jXT5pERcKs +++ b/tmp/tmp.WbdgGInmIr @@ -80,7 +80,6 @@ ixgbevf: ixgbevf_q_vector clean up ixgbe: Add 10G-BX support ice: unify PHY FW loading status handler for E800 devices ice: add support for unmanaged DPLL on E830 NIC -hsr: fix NULL pointer dereference in skb_clone with hw tag insertion net/mlx5: Document devlink rates net/mlx5: qos: Enable cross-device scheduling net/mlx5: qos: Support cross-device tx scheduling @@ -95,7 +94,6 @@ devlink: Refactor devlink_rate_nodes_check devlink: Add helpers to lock nested-in instances documentation: networking: add shared devlink documentation devlink: Reverse locking order for nested instances -mptcp: Initialise rcv_mss before calling tcp_send_active_reset() in mptcp_do_fastclose(). tun: flush deferred skb free list before bulk NAPI cache get net: core: export skb_defer_free_flush tun: use napi_consume_skb() in tun_put_user @@ -105,14 +103,6 @@ tun: correct drop statistics in tun_get_user tun: correct drop statistics in tun_put_user tun: correct drop statistics in tun_xdp_one tun: cleanup out label in tun_xdp_one -net: stmmac: dwmac: Disable flushing frames on Rx Buffer Unavailable -xsk: skip validating skb list in xmit path -selftests: af_unix: remove unused stdlib.h include -net: pcs: lynx: accept in-band autoneg for 2500base-x -net: fec: do not register PPS event for PEROUT -net: fec: do not allow enabling PPS and PEROUT simultaneously -net: fec: do not update PEROUT if it is enabled -net: fec: cancel perout_timer when PEROUT is disabled quic: add packet parser base quic: add packet builder base quic: add frame encoder and decoder base @@ -129,15 +119,3 @@ quic: provide family ops for address and protocol quic: provide common utilities and data structures net: build socket infrastructure for QUIC protocol net: define IPPROTO_QUIC and SOL_QUIC constants -selftests: bonding: add mux and churn state testing -bonding: restructure ad_churn_machine -bonding: set AD_RX_PORT_DISABLED when disabling a port -fbnic: Replace use of internal PCS w/ Designware XPCS -fbnic: Add SW shim for MDIO interface to PMD and PCS -fbnic: Add handler for reporting link down event statistics -fbnic: Add logic to track PMD state via MAC/PCS signals -fbnic: Rename PCS IRQ to MAC IRQ as it is actually a MAC interrupt -net: pcs: xpcs: Add support for FBNIC 25G, 50G, 100G PMD -net: pcs: xpcs: Fix PMA identifier handling in XPCS -net: pcs: xpcs: Add support for 25G, 50G, and 100G interfaces -net: phy: Add MDIO_PMA_CTRL1_SPEED for 2.5G and 5G to reflect PMA values