Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-10--00-00 (v6.15-rc5-1111-g3cc39c5d2e5b) remotes/brancher/net-next-2025-05-10--03-00 (v6.15-rc5-1114-g1d1e856e89f1) ==== BASE DIFF ==== drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 40 --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 295 +--------------- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 25 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 89 +---- .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 18 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 62 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c | 374 +++++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.h | 64 ++++ net/batman-adv/hard-interface.c | 31 +- net/batman-adv/main.c | 4 +- net/batman-adv/main.h | 3 +- net/batman-adv/mesh-interface.c | 15 - net/batman-adv/send.c | 4 +- net/batman-adv/translation-table.c | 2 +- 18 files changed, 541 insertions(+), 499 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.V9Gcwtw1dz b/tmp/tmp.y1iUcaiKlR index 9ce23cbf9caf..f3071feb429d 100644 --- a/tmp/tmp.V9Gcwtw1dz +++ b/tmp/tmp.y1iUcaiKlR @@ -41,12 +41,6 @@ PCI: hv: Allow dynamic MSI-X vector allocation PCI/MSI: Export pci_msix_prepare_desc() for dynamic MSI-X allocations net: libwx: Fix firmware interaction failure net: txgbe: Fix to calculate EEPROM checksum for AML devices -batman-adv: Drop unused net_namespace.h include -batman-adv: Switch to crc32 header for crc32c -batman-adv: no need to start/stop queue on mesh-iface -batman-adv: constify and move broadcast addr definition -batman-adv: Start new development cycle -batman-adv: fix duplicate MAC address check net: Lock lower level devices when updating features MLX5: Fix semaphore leak on command timeout net/mlx5: support software TX timestamp @@ -81,8 +75,5 @@ dt-bindings: net: Introduce the ethernet-connector description xfrm: Sanitize marks before insert net: phy: dp83867: use 2ns delay if not specified in DTB net: phy: dp83867: remove check of delay strap configuration -net: stmmac: dwxgmac2: Add support for HW-accelerated VLAN stripping -net: stmmac: stmmac_vlan: rename VLAN functions and symbol to generic symbol. -net: stmmac: Refactor VLAN implementation net: phy: micrel: remove KSZ9477 EEE quirks now handled by phylink net: dsa: microchip: let phylink manage PHY EEE configuration on KSZ switches