Merge pull request #1481 from kernelkit/kernel-upgrade-28e7d3e7-b875-4444-a0ed-a6c18cefd76d

troglobit · web-flow · commit 82ffb0f4bca6 · 2026-04-28T12:39:25.000+02:00
Upgrade to kernel 6.18.25
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig
@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/arm_defconfig b/configs/arm_defconfig
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/arm_minimal_defconfig b/configs/arm_minimal_defconfig
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -8,7 +8,7 @@ All notable changes to the project are documented in this file.
 
 ### Changes
 
-- Upgrade Linux kernel to 6.18.24 (LTS)
+- Upgrade Linux kernel to 6.18.25 (LTS)
 - Upgrade Buildroot to 2025.02.13 (LTS)
 - Add support for PTP/gPTP (IEEE 1588-2019 / 802.1AS) clock synchronization.
   Supported clock types: Ordinary Clock, Boundary Clock, and Transparent Clock.
diff --git a/patches/linux/6.18.25/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.18.25/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch
@@ -1,4 +1,4 @@
-From fc633b6d1ae3deba0a17a3395d2263ff7de1d3d8 Mon Sep 17 00:00:00 2001
+From 1a58edf0d4db2f4b0b894e1b98009380634bc7e1 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 01/48] net: phy: marvell10g: Support firmware loading on
diff --git a/patches/linux/6.18.25/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.18.25/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch
@@ -1,4 +1,4 @@
-From c164640043b8dc74b729d4392af367385a3f8f7d Mon Sep 17 00:00:00 2001
+From 88958b4437b9b6c51a24dbd24692e0e0b27f1438 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 02/48] net: phy: marvell10g: Fix power-up when strapped to
diff --git a/patches/linux/6.18.25/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.18.25/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch
@@ -1,4 +1,4 @@
-From 0f28d0aa85872532fa4cfe6813fc2a946b436cad Mon Sep 17 00:00:00 2001
+From ee98438d1e702735344ce470be5b55d2e9abc398 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 03/48] net: phy: marvell10g: Add LED support for 88X3310
diff --git a/patches/linux/6.18.25/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.18.25/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch
@@ -1,4 +1,4 @@
-From 2cab0d7cf75d7c439fa39ecec4afadd82177bb24 Mon Sep 17 00:00:00 2001
+From 9bde8e2bd4dce93ad5e80f5c9f8fc0e1f9a7d1ca Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 04/48] net: phy: marvell10g: Support LEDs tied to a single
diff --git a/patches/linux/6.18.25/0005-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.18.25/0005-net-phy-Do-not-resume-PHY-when-attaching.patch
@@ -1,4 +1,4 @@
-From f2cd1a8ad5887fc43b316342b3a33200f1eabd8a Mon Sep 17 00:00:00 2001
+From f2e1903dbc979b5da26d94eac73db97bde9f495a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 05/48] net: phy: Do not resume PHY when attaching
diff --git a/patches/linux/6.18.25/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.18.25/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch
@@ -1,4 +1,4 @@
-From 97c24cfc2dcd4c21dfb29a5dc6369c94b1aeb0b7 Mon Sep 17 00:00:00 2001
+From 4a3e8b33268460d283b48214ca158ebd93e96ead Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 06/48] net: bridge: avoid classifying unknown multicast as
diff --git a/patches/linux/6.18.25/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.18.25/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch
@@ -1,4 +1,4 @@
-From f09d51697d5a56b08e5d05180899fbb5e85706f4 Mon Sep 17 00:00:00 2001
+From ef1f7e05f43a38dd81bbbc4bbb8f1e70ad8b4180 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 07/48] net: bridge: Ignore router ports when forwarding L2
diff --git a/patches/linux/6.18.25/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.18.25/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch
@@ -1,4 +1,4 @@
-From d35dfdaa55e62284a10a4215068e7145f9b66336 Mon Sep 17 00:00:00 2001
+From 1b6e4e22f39f95684d91d43c4e4a48c997bc54a9 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 08/48] net: bridge: drop delay for applying strict multicast
diff --git a/patches/linux/6.18.25/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.18.25/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch
@@ -1,4 +1,4 @@
-From 3ac1aa6fa105e44b327ef9ff7e81fd6b764d94aa Mon Sep 17 00:00:00 2001
+From 5aa81b3d419d971e9ed6e1d61314075414a584b8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 09/48] net: bridge: Differentiate MDB additions from
diff --git a/patches/linux/6.18.25/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.18.25/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch
@@ -1,4 +1,4 @@
-From 229661903b2d2de0a0e2209ff4915500d9769973 Mon Sep 17 00:00:00 2001
+From 7f2bc7bff72bcdbf46a7c40ab19790ccd9a6fca2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 10/48] nvmem: layouts: onie-tlv: Let device probe even when
diff --git a/patches/linux/6.18.25/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.18.25/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch
@@ -1,4 +1,4 @@
-From 0b3406b5ed16bfd23715ff3aa8cff098a14aa0e2 Mon Sep 17 00:00:00 2001
+From 7df1f07e90e3c4846a5770bf9e5d6723d180f61f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
 Subject: [PATCH 11/48] net: usb: r8152: add r8153b support for link/activity
diff --git a/patches/linux/6.18.25/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch b/patches/linux/6.18.25/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch
@@ -1,4 +1,4 @@
-From a68fa2aea6f23149db25c92629c38c67e415454e Mon Sep 17 00:00:00 2001
+From e716d8e693ba5e553d79f659f154e120d7799703 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 10 Aug 2025 18:52:54 +0200
 Subject: [PATCH 12/48] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to
diff --git a/patches/linux/6.18.25/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/patches/linux/6.18.25/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -1,4 +1,4 @@
-From cefae1e7c6a3cfff52c0cfe283f3eac735ff7dd3 Mon Sep 17 00:00:00 2001
+From 907a2d33e007604e37eaacbc12a82fc930f60c4f Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 20 Aug 2025 21:38:24 +0200
 Subject: [PATCH 13/48] drm/panel-simple: Add a timing for the Raspberry Pi 7"
diff --git a/patches/linux/6.18.25/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch b/patches/linux/6.18.25/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch
@@ -1,4 +1,4 @@
-From d43ca5553d7e43b0bd7abdcd059bc935c3a5b84a Mon Sep 17 00:00:00 2001
+From 02efd1af3a3688da535b7ccfb131acca099b16ed Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 21 Aug 2025 11:20:23 +0200
 Subject: [PATCH 14/48] input:touchscreen:edt-ft5x06: Add polled mode
diff --git a/patches/linux/6.18.25/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.18.25/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch
@@ -1,4 +1,4 @@
-From cf5c1c7880b9fe8b0f9d89b045fa491c940388c9 Mon Sep 17 00:00:00 2001
+From bdd547ca4fe915df479094bd4184d0870bfb20fc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 15/48] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
diff --git a/patches/linux/6.18.25/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.18.25/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch
@@ -1,4 +1,4 @@
-From 58eb444db662d6d6421f0445511c3a6eecb209cc Mon Sep 17 00:00:00 2001
+From bf7ea26e4ab01fd94b6e43507c9cbb47fca4fc6f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 16/48] net: dsa: mv88e6xxx: Improve indirect register access
diff --git a/patches/linux/6.18.25/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.18.25/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch
@@ -1,4 +1,4 @@
-From 88a22161fd48eb636cc89841847563310c2f32e2 Mon Sep 17 00:00:00 2001
+From cd5282da53b15d91b18b9f365ee4ecc453c69260 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 17/48] net: dsa: mv88e6xxx: Honor ports being managed via
diff --git a/patches/linux/6.18.25/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.18.25/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch
@@ -1,4 +1,4 @@
-From d73dfebea65b2eec6d29be0986fd7f9918dc70d7 Mon Sep 17 00:00:00 2001
+From 01b7489743f6d4a385e4e2e25fc1988235aa9e0b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 18/48] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
diff --git a/patches/linux/6.18.25/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.18.25/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch
@@ -1,4 +1,4 @@
-From 76d5ff2ec2011117c8ef578fa1efd39d365eb2e3 Mon Sep 17 00:00:00 2001
+From 1c8c377c0d8638ed2d1d43414ea9bcb7522788f0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 19/48] net: dsa: tag_dsa: Use tag priority as initial
diff --git a/patches/linux/6.18.25/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.18.25/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch
@@ -1,4 +1,4 @@
-From 3f5980a6fdf732e7c9f3fb6a2484736c33ce9c02 Mon Sep 17 00:00:00 2001
+From 177bb276b21b8d2ddc8f0c142155e56aa5a0d021 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 20/48] net: dsa: Support MDB memberships whose L2 addresses
diff --git a/patches/linux/6.18.25/0021-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.18.25/0021-net-dsa-Support-EtherType-based-priority-overrides.patch
@@ -1,4 +1,4 @@
-From 1ae50c435e6159e4da16038c9db29267b1f2e409 Mon Sep 17 00:00:00 2001
+From 894c8e45709a629c4b10d079b31f1f4800a43677 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 21/48] net: dsa: Support EtherType based priority overrides
diff --git a/patches/linux/6.18.25/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.18.25/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch
@@ -1,4 +1,4 @@
-From a6a9713e49354fe04ca9f00bf502c43facc2250c Mon Sep 17 00:00:00 2001
+From 5004969cb16e3c23e517105ff2030a76a21df966 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 22/48] net: dsa: mv88e6xxx: Support EtherType based priority
diff --git a/patches/linux/6.18.25/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.18.25/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch
@@ -1,4 +1,4 @@
-From aa9cd69c3c45135bca1bebded3cc2da2499bf483 Mon Sep 17 00:00:00 2001
+From 9784e108d7e23741bfe5f2793faec26ff213ca86 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 23/48] net: dsa: mv88e6xxx: Add mqprio qdisc support
diff --git a/patches/linux/6.18.25/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.18.25/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch
@@ -1,4 +1,4 @@
-From cd2acb7b784271f6d991b1a67c7a8088f745373a Mon Sep 17 00:00:00 2001
+From 7a5d8a80b8c5df68956486da53b06548b7d3e196 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 24/48] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
diff --git a/patches/linux/6.18.25/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.18.25/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch
@@ -1,4 +1,4 @@
-From b41a25935f2eb5fec28f2ad38b374b21b7a2836a Mon Sep 17 00:00:00 2001
+From 43effaa176813e0e770c224582dd99c0e139979c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 25/48] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
diff --git a/patches/linux/6.18.25/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.18.25/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch
@@ -1,4 +1,4 @@
-From f257658087afcff946fbe3143e1f36d75b8542b4 Mon Sep 17 00:00:00 2001
+From c51a3e7a888b1ad8606e1b25cd7c96e65f93b15a Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
 Subject: [PATCH 26/48] net: dsa: mv88e6xxx: collapse disabled state into
diff --git a/patches/linux/6.18.25/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.18.25/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch
@@ -1,4 +1,4 @@
-From f4cee8b70ab34b29c0755750f8c14800fc5f5cfb Mon Sep 17 00:00:00 2001
+From 944eb4b7e5511cfd115124fd54a79cd9d827cc1c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
 Subject: [PATCH 27/48] net: dsa: mv88e6xxx: Only activate LAG offloading when
diff --git a/patches/linux/6.18.25/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.18.25/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch
@@ -1,4 +1,4 @@
-From afe1d3f1c5d1a32b9f56cbcf76563ed7f65debb4 Mon Sep 17 00:00:00 2001
+From b6e365e47484728bfc50b52ee066f8fb2763bec7 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 14 Jan 2026 18:22:41 +0100
 Subject: [PATCH 28/48] net: dsa: mv88e6xxx: Add LED support for 6393X
diff --git a/patches/linux/6.18.25/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch b/patches/linux/6.18.25/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch
@@ -1,4 +1,4 @@
-From a30b99133257c3edcbd24bdf66d1737c4bd3e1cf Mon Sep 17 00:00:00 2001
+From 756f5d27cfcb0ae6f5b22aa481c002b89f50bb66 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 15 Jan 2026 22:47:37 +0100
 Subject: [PATCH 29/48] wifi: brcmfmac: support deletion and recreation of
diff --git a/patches/linux/6.18.25/0030-wifi-brcmfmac-check-connection-state-before-querying.patch b/patches/linux/6.18.25/0030-wifi-brcmfmac-check-connection-state-before-querying.patch
@@ -1,4 +1,4 @@
-From a8d9bcc61b31a78231749908b20523ab044f3c54 Mon Sep 17 00:00:00 2001
+From a1a034f88eebe3ac427ee3eded3d701df373ee24 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Mon, 19 Jan 2026 13:06:53 +0100
 Subject: [PATCH 30/48] wifi: brcmfmac: check connection state before querying
diff --git a/patches/linux/6.18.25/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch b/patches/linux/6.18.25/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch
@@ -1,4 +1,4 @@
-From f74107b9542b042ba487dbd90bb0c05da1ecb6de Mon Sep 17 00:00:00 2001
+From bcfe1fc5235c276c41b46bf3281a6ed1263999f8 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:12:10 +0100
 Subject: [PATCH 31/48] wifi: brcmfmac: suppress log spam for
diff --git a/patches/linux/6.18.25/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch b/patches/linux/6.18.25/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch
@@ -1,4 +1,4 @@
-From 94d3cc092c25d5de644f3366b386cfd1d442797d Mon Sep 17 00:00:00 2001
+From 54eaebf53119b5f64155739e1decf9d290f2a843 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:18:45 +0100
 Subject: [PATCH 32/48] wifi: brcmfmac: reduce log noise during AP to station
diff --git a/patches/linux/6.18.25/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch b/patches/linux/6.18.25/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch
@@ -1,4 +1,4 @@
-From c83fac55bed9bbbb14c1f09d35c25ca349975d56 Mon Sep 17 00:00:00 2001
+From 97379c6ac8d1a770a648c4efa9b0e1e8149abefe Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 17 Feb 2026 21:59:59 +0100
 Subject: [PATCH 33/48] net: phy: air_en8811h: add OF device table for
diff --git a/patches/linux/6.18.25/0034-drm-vc4-dsi-enable-video-and-then-retry-failed-trans.patch b/patches/linux/6.18.25/0034-drm-vc4-dsi-enable-video-and-then-retry-failed-trans.patch
@@ -1,4 +1,4 @@
-From cd0a037152133ff2f2861e2b2b56ee43956bba3c Mon Sep 17 00:00:00 2001
+From f2048d36925ccbd8717bb0ecc813d3579d868c87 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 20 Sep 2024 12:05:18 +0100
 Subject: [PATCH 34/48] drm: vc4: dsi: enable video and then retry failed
diff --git a/patches/linux/6.18.25/0035-drm-vc4-dsi-Clocks-should-be-running-before-reset.patch b/patches/linux/6.18.25/0035-drm-vc4-dsi-Clocks-should-be-running-before-reset.patch
@@ -1,4 +1,4 @@
-From ba3a3a779544cdcadbb0b5a549b12ec05fb54c9d Mon Sep 17 00:00:00 2001
+From 9216d1b629afdcff20cfcd196a8c89c07be83820 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Jun 2022 17:23:47 +0100
 Subject: [PATCH 35/48] drm: vc4: dsi: Clocks should be running before reset
diff --git a/patches/linux/6.18.25/0036-drm-vc4-Ensure-DSI-is-enabled-for-FIFO-resets.patch b/patches/linux/6.18.25/0036-drm-vc4-Ensure-DSI-is-enabled-for-FIFO-resets.patch
@@ -1,4 +1,4 @@
-From 2a54da384157c69902371904623ce1ac77b05ac0 Mon Sep 17 00:00:00 2001
+From 3d24f34e92e4ed3da2b945b8ca7884a0a05f4cff Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 5 Apr 2024 17:51:55 +0100
 Subject: [PATCH 36/48] drm/vc4: Ensure DSI is enabled for FIFO resets
diff --git a/patches/linux/6.18.25/0037-drm-vc4-Reset-DSI-AFE-on-disable.patch b/patches/linux/6.18.25/0037-drm-vc4-Reset-DSI-AFE-on-disable.patch
@@ -1,4 +1,4 @@
-From df3b30e1b7e7ac6da8ddaa901cfc21670e4c309e Mon Sep 17 00:00:00 2001
+From 62c6ef5d223b714484400aac1fbcddcacb46326d Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 26 May 2022 18:56:19 +0100
 Subject: [PATCH 37/48] drm: vc4: Reset DSI AFE on disable
diff --git a/patches/linux/6.18.25/0038-drm-vc4-dsi-Handle-the-different-command-FIFO-widths.patch b/patches/linux/6.18.25/0038-drm-vc4-dsi-Handle-the-different-command-FIFO-widths.patch
@@ -1,4 +1,4 @@
-From 15661aa247c9ace150417d8d392a5813b80139d7 Mon Sep 17 00:00:00 2001
+From 403bf67e49eb5d3063346338570e5fceadc2027b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 20 Nov 2024 13:58:08 +0000
 Subject: [PATCH 38/48] drm: vc4: dsi: Handle the different command FIFO widths
diff --git a/patches/linux/6.18.25/0039-drm-bridge-tc358762-Program-the-DPI-mode-into-the-ch.patch b/patches/linux/6.18.25/0039-drm-bridge-tc358762-Program-the-DPI-mode-into-the-ch.patch
@@ -1,4 +1,4 @@
-From c26abe1e7f09caab96b318105c9808a607380abc Mon Sep 17 00:00:00 2001
+From 1b4f1b6cce1e547900f72567cde80333cdad0f76 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 17:37:00 +0000
 Subject: [PATCH 39/48] drm/bridge: tc358762: Program the DPI mode into the
diff --git a/patches/linux/6.18.25/0040-drm-bridge-tc358762-revert-move-ops-to-enable.patch b/patches/linux/6.18.25/0040-drm-bridge-tc358762-revert-move-ops-to-enable.patch
@@ -1,4 +1,4 @@
-From 1a1f21fe215ded4d142538120ff4b3491703aaf8 Mon Sep 17 00:00:00 2001
+From 76194b41b768ac593fe65e148b678518c415707c Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 18:44:49 +0000
 Subject: [PATCH 40/48] drm/bridge: tc358762: revert move ops to enable
diff --git a/patches/linux/6.18.25/0041-drm-bridge-tc358762-Set-pre_enabled-on-pre_enable-to.patch b/patches/linux/6.18.25/0041-drm-bridge-tc358762-Set-pre_enabled-on-pre_enable-to.patch
@@ -1,4 +1,4 @@
-From 202c9855f27111f9c8c646483ed47e2ceceb0cf1 Mon Sep 17 00:00:00 2001
+From b6982edd767b28e98243bc82916f9668bf0061f3 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Sat, 4 Apr 2026 18:04:19 +0200
 Subject: [PATCH 41/48] drm/bridge: tc358762: Set pre_enabled on pre_enable to
diff --git a/patches/linux/6.18.25/0042-net-pcs-add-standalone-PCS-registration-infrastructu.patch b/patches/linux/6.18.25/0042-net-pcs-add-standalone-PCS-registration-infrastructu.patch
@@ -1,4 +1,4 @@
-From 3e1a26aecde3525880ca6eb3ce45b63db424b0e4 Mon Sep 17 00:00:00 2001
+From 2f40a2b7a09b4f608ebb97a0e80510ddf2612830 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 5 Apr 2026 11:33:00 +0200
 Subject: [PATCH 42/48] net/pcs: add standalone PCS registration infrastructure
diff --git a/patches/linux/6.18.25/0043-net-pcs-add-MediaTek-MT7988-USXGMII-PCS-driver.patch b/patches/linux/6.18.25/0043-net-pcs-add-MediaTek-MT7988-USXGMII-PCS-driver.patch
@@ -1,4 +1,4 @@
-From 536d2141903e99febf127b0a484d403e0f6711f3 Mon Sep 17 00:00:00 2001
+From 2e49d3e1bd7afc5ba4519c49bf87bcbe208d2581 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:14:23 +0200
 Subject: [PATCH 43/48] net/pcs: add MediaTek MT7988 USXGMII PCS driver
diff --git a/patches/linux/6.18.25/0044-net-ethernet-mediatek-add-USXGMII-support-for-MT7988.patch b/patches/linux/6.18.25/0044-net-ethernet-mediatek-add-USXGMII-support-for-MT7988.patch
@@ -1,4 +1,4 @@
-From 475a9b312e8fca11863fa3fffa918988e9c40ce0 Mon Sep 17 00:00:00 2001
+From 8ceb2af6162ee23ea0dc98e84d7c0883a4ecbdea Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:43 +0200
 Subject: [PATCH 44/48] net: ethernet: mediatek: add USXGMII support for MT7988
@@ -126,7 +126,7 @@ index b4c01e2878f6..57380776032a 100644
 +}
 +
 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index 8d3e15bc867d..e6347b08648a 100644
+index 0f676bd72832..79f8a5b19a23 100644
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 @@ -22,6 +22,7 @@
@@ -181,7 +181,7 @@ index 8d3e15bc867d..e6347b08648a 100644
  		dev_err(eth->dev,
  			"In-band mode not supported in non SGMII mode!\n");
  		return;
-@@ -4912,6 +4934,28 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
+@@ -4932,6 +4954,28 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  			  mac->phylink_config.supported_interfaces);
  	}
  
diff --git a/patches/linux/6.18.25/0045-arm64-dts-mediatek-mt7988a-add-USXGMII-PCS-nodes.patch b/patches/linux/6.18.25/0045-arm64-dts-mediatek-mt7988a-add-USXGMII-PCS-nodes.patch
@@ -1,4 +1,4 @@
-From b266344f68351ca23a03332a13b33eb0347fa0de Mon Sep 17 00:00:00 2001
+From 1a63aeb524af022fb43b3ab6ac666522d2bb2d0f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:56 +0200
 Subject: [PATCH 45/48] arm64: dts: mediatek: mt7988a: add USXGMII PCS nodes
diff --git a/patches/linux/6.18.25/0046-arm64-dts-mediatek-bananapi-bpi-r4-enable-SFP-ports-.patch b/patches/linux/6.18.25/0046-arm64-dts-mediatek-bananapi-bpi-r4-enable-SFP-ports-.patch
@@ -1,4 +1,4 @@
-From e9bd649b7ebb9739df503c553b468ddcd8b3aad7 Mon Sep 17 00:00:00 2001
+From 6337586eb2f26cf011d21dc3065c02f0d022ceae Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:16:11 +0200
 Subject: [PATCH 46/48] arm64: dts: mediatek: bananapi-bpi-r4: enable SFP+
diff --git a/patches/linux/6.18.25/0047-net-phy-sfp-add-OEM-SFP-10G-T-I-quirk.patch b/patches/linux/6.18.25/0047-net-phy-sfp-add-OEM-SFP-10G-T-I-quirk.patch
@@ -1,4 +1,4 @@
-From 65014223f101e4e37534c15d742c6f014f45e7f7 Mon Sep 17 00:00:00 2001
+From 83a80e1f67550dc5f58c8711f1d1612cd9233911 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 7 Apr 2026 07:34:52 +0200
 Subject: [PATCH 47/48] net: phy: sfp: add OEM SFP-10G-T-I quirk
diff --git a/patches/linux/6.18.25/0048-net-dsa-mv88e6xxx-Trap-PTP-frames-on-timestamping-po.patch b/patches/linux/6.18.25/0048-net-dsa-mv88e6xxx-Trap-PTP-frames-on-timestamping-po.patch
@@ -1,4 +1,4 @@
-From afa584364d622ea79d9dec79abcc1e14773e5741 Mon Sep 17 00:00:00 2001
+From cc7f3e6a3361b44aec2d614cd1307fa275dcd3a5 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 17 Apr 2026 09:13:04 +0000
 Subject: [PATCH 48/48] net: dsa: mv88e6xxx: Trap PTP frames on timestamping
diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash
@@ -1,2 +1,2 @@
 # Calculated with utils/kernel-refresh.sh
-sha256   c207c557ce58103b4dda30e26da5203f3d8467c6dadc53d709f6d83ae1d1255f  linux-6.18.24.tar.xz
+sha256   29680a07d4430b269af6ce68079b0e81dbd60f03e6f351e0661991fe39bd1898  linux-6.18.25.tar.xz

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From fc633b6d1ae3deba0a17a3395d2263ff7de1d3d8 Mon Sep 17 00:00:00 2001`
	`1`	`+From 1a58edf0d4db2f4b0b894e1b98009380634bc7e1 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <tobias@waldekranz.com>`
`3`	`3`	`Date: Tue, 19 Sep 2023 18:38:10 +0200`
`4`	`4`	`Subject: [PATCH 01/48] net: phy: marvell10g: Support firmware loading on`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From c164640043b8dc74b729d4392af367385a3f8f7d Mon Sep 17 00:00:00 2001`
	`1`	`+From 88958b4437b9b6c51a24dbd24692e0e0b27f1438 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <tobias@waldekranz.com>`
`3`	`3`	`Date: Tue, 21 Nov 2023 20:15:24 +0100`
`4`	`4`	`Subject: [PATCH 02/48] net: phy: marvell10g: Fix power-up when strapped to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 0f28d0aa85872532fa4cfe6813fc2a946b436cad Mon Sep 17 00:00:00 2001`
	`1`	`+From ee98438d1e702735344ce470be5b55d2e9abc398 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <tobias@waldekranz.com>`
`3`	`3`	`Date: Wed, 15 Nov 2023 20:58:42 +0100`
`4`	`4`	`Subject: [PATCH 03/48] net: phy: marvell10g: Add LED support for 88X3310`