Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-10-16--00-00 (net-next-6.18-11078-g478dc00fb882) remotes/brancher/net-next-hw-2025-10-16--08-00 (net-next-6.18-11117-g5f0ae16e0fc6) ==== BASE DIFF ==== .mailmap | 1 + .../devicetree/bindings/net/airoha,en7581-npu.yaml | 1 + Documentation/networking/can.rst | 71 +++++++++- MAINTAINERS | 10 ++ drivers/net/can/m_can/m_can.c | 66 +++++---- drivers/net/can/m_can/m_can_platform.c | 6 +- drivers/net/can/usb/gs_usb.c | 23 ++- drivers/net/ethernet/airoha/airoha_npu.c | 93 +++++++++---- .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 34 ++++- drivers/net/ethernet/broadcom/tg3.c | 5 +- drivers/net/netdevsim/netdev.c | 7 + drivers/net/pse-pd/pd692x0.c | 155 +++++++++++++++------ drivers/net/usb/lan78xx.c | 8 +- include/net/sock.h | 12 +- net/can/j1939/main.c | 2 + net/netlink/af_netlink.c | 4 +- net/tipc/socket.c | 4 +- net/tls/tls_main.c | 7 +- net/tls/tls_sw.c | 31 ++++- tools/testing/selftests/net/tls.c | 65 +++++++++ 20 files changed, 454 insertions(+), 151 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.1q5iUdqJgv b/tmp/tmp.f3EJ02vQ6k index 99f4f15c5c53..0ca5e28bb2a2 100644 --- a/tmp/tmp.1q5iUdqJgv +++ b/tmp/tmp.f3EJ02vQ6k @@ -13,8 +13,41 @@ 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: dsa: lantiq_gswip: treat VID 0 like the PVID +net: dsa: lantiq_gswip: drop untagged on VLAN-aware bridge ports with no PVID +net: dsa: lantiq_gswip: put a more descriptive error print in gswip_vlan_remove() +net: dsa: lantiq_gswip: remove vlan_aware and pvid arguments from gswip_vlan_remove() +net: dsa: lantiq_gswip: disallow changes to privately set up VID 0 +net: dsa: lantiq_gswip: permit dynamic changes to VLAN filtering state +net: dsa: lantiq_gswip: remove legacy configure_vlan_while_not_filtering option +net: dsa: lantiq_gswip: merge gswip_vlan_add_unaware() and gswip_vlan_add_aware() +net: dsa: lantiq_gswip: remove duplicate assignment to vlan_mapping.val[0] +net: dsa: lantiq_gswip: define VLAN ID 0 constant +net: dsa: lantiq_gswip: support bridge FDB entries on the CPU port rtnetlink: Allow deleting FDB entries in user namespace -sctp: avoid NULL dereference when chunk data buffer is missing +dt-bindings: net: qcom: ethernet: Add interconnect properties +net: stmmac: rename stmmac_phy_setup() to include phylink +net: stmmac: rearrange tc_init() +net: stmmac: avoid PHY speed change when configuring MTU +net: stmmac: place .mac_finish() method more appropriately +net: stmmac: dwc-qos-eth: move MDIO bus locking into stmmac_mdio +net: ravb: Enforce descriptor type ordering to prevent early DMA start +net: ravb: Allocate correct number of queues based on SoC support +net: ravb: Make DBAT entry count configurable per-SoC +net: stmmac: convert to phylink PCS support +net: stmmac: provide PCS initialisation hook +net: stmmac: only call stmmac_pcs_ctrl_ane() for integrated SGMII PCS +net: stmmac: do not require snps,ps-speed for SGMII +net: stmmac: hw->ps becomes hw->reverse_sgmii_enable +net: stmmac: simplify stmmac_check_pcs_mode() +net: stmmac: move reverse-"pcs" mode setup to stmmac_check_pcs_mode() +net: stmmac: remove RGMII "pcs" mode +net: stmmac: remove hw->ps xxx_core_init() hardware setup +net: stmmac: remove unused PCS loopback support +net: stmmac: remove PCS "mode" pause handling +net: stmmac: remove SGMII/RGMII/SMII interrupt handling +net: stmmac: remove xstats.pcs_* members +net: stmmac: remove broken PCS code net: bonding: update the slave array for broadcast mode net: stmmac: add Eswin EIC7700 glue driver dt-bindings: ethernet: eswin: Document for EIC7700 SoC @@ -30,31 +63,11 @@ net/mlx5e: psp, avoid 'accel' NULL pointer dereference net: gro: clear skb_shinfo(skb)->hwtstamps in napi_reuse_skb() udp: do not use skb_release_head_state() before skb_attempt_defer_free() net: dwmac-rk: No need to check the return value of phy_power_on() -dpaa2-eth: treat skb with exact headroom as scatter/gather frames net: amd-xgbe: use EOPNOTSUPP instead of ENOTSUPP in xgbe_phy_mii_read_c45 net/mlx5e: Return 1 instead of 0 in invalid case in mlx5e_mpwrq_umr_entry_size() net: usb: rtl8150: Fix frame padding -tg3: prevent use of uninitialized remote_adv and local_adv variables netpoll: Fix deadlock in memory allocation under spinlock net: stmmac: dwmac-rk: Fix disabling set_clock_selection -can: j1939: add missing calls in NETDEV_UNREGISTER notification handler -can: add Transmitter Delay Compensation (TDC) documentation -can: remove false statement about 1:1 mapping between DLC and length -can: m_can: replace Dong Aisheng's old email address -can: m_can: fix CAN state in system PM -can: m_can: m_can_chip_config(): bring up interface in correct state -can: m_can: m_can_handle_state_errors(): fix CAN state transition to Error Active -can: m_can: m_can_plat_remove(): add missing pm_runtime_disable() -can: gs_usb: gs_make_candev(): populate net_device->dev_port -can: gs_usb: increase max interface to U8_MAX -netdevsim: set the carrier when the device goes up -selftests: tls: add test for short splice due to full skmsg -selftests: net: tls: add tests for cmsg vs MSG_MORE -tls: don't rely on tx_work during send() -tls: wait for pending async decryptions if tls_strp_msg_hold fails -tls: always set record_type in tls_process_cmsg -tls: wait for async encrypt in case of error during latter iterations of sendmsg -tls: trim encrypted message to match the plaintext on short splice net: dsa: yt921x: Add support for Motorcomm YT921x net: dsa: tag_yt921x: add support for Motorcomm YT921x tags dt-bindings: net: dsa: yt921x: Add Motorcomm YT921x switch support @@ -68,8 +81,6 @@ bonding: Adding struct bond_arp_target dt-bindings: net: Convert amd,xgbe-seattle-v1a to DT schema net: fbnic: Allow builds for all 64 bit architectures net: fbnic: Fix page chunking logic when PAGE_SIZE > 4K -net: usb: lan78xx: fix use of improperly initialized dev->chipid in lan78xx_reset -net: bcmasp: Add support for PHY-based Wake-on-LAN tcp: accecn: enable AccECN tcp: accecn: detect loss ACK w/ AccECN option and add TCP_ACCECN_OPTION_PERSIST tcp: accecn: verify ACE counter in 1st ACK after AccECN negotiation @@ -99,10 +110,3 @@ net: phy: Introduce PHY ports representation net: ethtool: Introduce ETHTOOL_LINK_MEDIUM_* values net: ethtool: common: Indicate that BaseT works on up to 4 lanes dt-bindings: net: Introduce the ethernet-connector description -net: pse-pd: pd692x0: Preserve PSE configuration across reboots -net: pse-pd: pd692x0: Separate configuration parsing from hardware setup -net: pse-pd: pd692x0: Replace __free macro with explicit kfree calls -net: airoha: npu: Add 7583 SoC support -net: airoha: npu: Add airoha_npu_soc_data struct -dt-bindings: net: airoha: npu: Add AN7583 support -net: cxgb4/ch_ipsec: fix potential use-after-free in ch_ipsec_xfrm_add_state() callback