Upgrade Linux kernel to 6.18.21

ael-bot · ael-bot · commit 003aee9b53b8 · 2026-04-02T11:57:37.000Z
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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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.20"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
 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/patches/linux/6.18.21/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.18.21/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch
@@ -1,4 +1,4 @@
-From 4668726493784ba2516ed7a0895bca9d92c902d0 Mon Sep 17 00:00:00 2001
+From 657a79b59e67bac4af66f63bcf740238af399aba 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/33] net: phy: marvell10g: Support firmware loading on
diff --git a/patches/linux/6.18.21/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.18.21/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch
@@ -1,4 +1,4 @@
-From bc8058a8f55621f457277ea840c20cae1403dffa Mon Sep 17 00:00:00 2001
+From 6684303b2262468f91f4aab0755a35f8dc2ee141 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/33] net: phy: marvell10g: Fix power-up when strapped to
diff --git a/patches/linux/6.18.21/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.18.21/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch
@@ -1,4 +1,4 @@
-From dc7bb5be38924c26f498f67a52f9534f1fbe92d5 Mon Sep 17 00:00:00 2001
+From ee1464a4becdb06df87ae167fb56d9ac1530512f 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/33] net: phy: marvell10g: Add LED support for 88X3310
diff --git a/patches/linux/6.18.21/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.18.21/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch
@@ -1,4 +1,4 @@
-From dcbbc30a5c0be8a471df6177f8ec8a8f75a6b88b Mon Sep 17 00:00:00 2001
+From cfe0f07454be8ab659b33fafd83a57b2d44f2fdf 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/33] net: phy: marvell10g: Support LEDs tied to a single
diff --git a/patches/linux/6.18.21/0005-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.18.21/0005-net-phy-Do-not-resume-PHY-when-attaching.patch
@@ -1,4 +1,4 @@
-From f7c433ea153eaacf21e59870cc9952e504e27ded Mon Sep 17 00:00:00 2001
+From e0d9221901b235ffb4c0ea58748e8e5263eb0d9f 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/33] net: phy: Do not resume PHY when attaching
diff --git a/patches/linux/6.18.21/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.18.21/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch
@@ -1,4 +1,4 @@
-From f6acd7c7e7649c22c2529cd45a125f96811275c5 Mon Sep 17 00:00:00 2001
+From 86cdec8b0959cf957b2811a23ddf77648161a402 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/33] net: bridge: avoid classifying unknown multicast as
diff --git a/patches/linux/6.18.21/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.18.21/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch
@@ -1,4 +1,4 @@
-From 831983650ef0f60d63db154148812691c315fbd0 Mon Sep 17 00:00:00 2001
+From 31794e03e7f1d66f7fdff708cdaa40453e591204 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/33] net: bridge: Ignore router ports when forwarding L2
diff --git a/patches/linux/6.18.21/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.18.21/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch
@@ -1,4 +1,4 @@
-From 6784037db86d8c0d0bd7b492b9d2374abe1efe6e Mon Sep 17 00:00:00 2001
+From 984d59e5f06c3741e1c76daf4bed6883eb339e97 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/33] net: bridge: drop delay for applying strict multicast
diff --git a/patches/linux/6.18.21/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.18.21/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch
@@ -1,4 +1,4 @@
-From 19f62bfa78c412c7176bcb7eb97f39ea3619dfba Mon Sep 17 00:00:00 2001
+From e3f31e30e7086bdd0b9698deb0b036d5e8ebb99e 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/33] net: bridge: Differentiate MDB additions from
diff --git a/patches/linux/6.18.21/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.18.21/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch
@@ -1,4 +1,4 @@
-From a8e238867595ab85d809430988556e295f58dac0 Mon Sep 17 00:00:00 2001
+From 7f1e44c7216953f3b09e2aa6df4c739ce2e1d480 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/33] nvmem: layouts: onie-tlv: Let device probe even when
diff --git a/patches/linux/6.18.21/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.18.21/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch
@@ -1,4 +1,4 @@
-From 4ce3d5eff536faba3312f013591fab01d02b85f7 Mon Sep 17 00:00:00 2001
+From 080f229c35d686e8c260092e18caa39cbe833392 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/33] net: usb: r8152: add r8153b support for link/activity
@@ -18,7 +18,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index da8de7b1a489..36d79a77316c 100644
+index 357f5c733d0b..e7aa0cffadc5 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
 @@ -41,6 +41,11 @@
diff --git a/patches/linux/6.18.21/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch b/patches/linux/6.18.21/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch
@@ -1,4 +1,4 @@
-From c94d33462384a20397a8a8e6e2def4a839df1ba7 Mon Sep 17 00:00:00 2001
+From 2040cffd47b80aa352b624ddaa66f47f85d5c88a 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/33] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to
diff --git a/patches/linux/6.18.21/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/patches/linux/6.18.21/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -1,4 +1,4 @@
-From 7d5a7b1ffb255c6822f6dfa5b605a2778ac99622 Mon Sep 17 00:00:00 2001
+From db4b35cf2ce8f06e9ed65b394728e846f92af4b7 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/33] drm/panel-simple: Add a timing for the Raspberry Pi 7"
diff --git a/patches/linux/6.18.21/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch b/patches/linux/6.18.21/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch
@@ -1,4 +1,4 @@
-From 49040c4d65154c886af6c36a105dfa2b11e98c8e Mon Sep 17 00:00:00 2001
+From c6bdd72407392acd6f29e6a1554724953ec8590f 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/33] input:touchscreen:edt-ft5x06: Add polled mode
diff --git a/patches/linux/6.18.21/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.18.21/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch
@@ -1,4 +1,4 @@
-From 90ac990a7e6439ee6e89cd443ba31c627acd838b Mon Sep 17 00:00:00 2001
+From 0361723f9ea674aab4e76f4a88471c1719976623 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/33] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
diff --git a/patches/linux/6.18.21/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.18.21/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch
@@ -1,4 +1,4 @@
-From d2ec2b3a83a805f12c69e79e40631dd05522a1d0 Mon Sep 17 00:00:00 2001
+From d9cc0e3a04dec8b02edbb0510eaee73734e9fe1b 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/33] net: dsa: mv88e6xxx: Improve indirect register access
diff --git a/patches/linux/6.18.21/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.18.21/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch
@@ -1,4 +1,4 @@
-From 4a9f724a4b4c0d6f7aa2e394ea510898a101b9db Mon Sep 17 00:00:00 2001
+From 8516fa6ca5c60461f61703525eb29efc2f90e83f 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/33] net: dsa: mv88e6xxx: Honor ports being managed via
diff --git a/patches/linux/6.18.21/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.18.21/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch
@@ -1,4 +1,4 @@
-From 07a36716fcc4325eafeef93ace4171971d830747 Mon Sep 17 00:00:00 2001
+From 46f0ce2051d0ddb753a663b5bc2a622758100899 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/33] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
diff --git a/patches/linux/6.18.21/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.18.21/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch
@@ -1,4 +1,4 @@
-From d5e22b33a9a2ce021c23b991f6d305535659f62d Mon Sep 17 00:00:00 2001
+From 07600da9729116e9d146a961a681312fd5945831 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/33] net: dsa: tag_dsa: Use tag priority as initial
diff --git a/patches/linux/6.18.21/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.18.21/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch
@@ -1,4 +1,4 @@
-From ab8b7eb1c7bb7b37c21a4041266eaba9466d6a74 Mon Sep 17 00:00:00 2001
+From 3d7009324b7b0855621b1187cdd02f5cd1d10aae 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/33] net: dsa: Support MDB memberships whose L2 addresses
diff --git a/patches/linux/6.18.21/0021-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.18.21/0021-net-dsa-Support-EtherType-based-priority-overrides.patch
@@ -1,4 +1,4 @@
-From 499ad7204f48cb5c603433dba26a744f12640a5b Mon Sep 17 00:00:00 2001
+From 3f046855852e41283e4855575974f376c4d82976 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/33] net: dsa: Support EtherType based priority overrides
diff --git a/patches/linux/6.18.21/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.18.21/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch
@@ -1,4 +1,4 @@
-From 69f70466980bd5c353409e193a2c19c358c0929a Mon Sep 17 00:00:00 2001
+From ab5c530c7dbf9f8dacf42231d4aa8331ae874c00 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/33] net: dsa: mv88e6xxx: Support EtherType based priority
diff --git a/patches/linux/6.18.21/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.18.21/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch
@@ -1,4 +1,4 @@
-From 41855c1f180b217a236e3d92d1ac6b6e1e08c070 Mon Sep 17 00:00:00 2001
+From 1a2c045f9e4fd595803b014bd85e2914b9003e8d 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/33] net: dsa: mv88e6xxx: Add mqprio qdisc support
diff --git a/patches/linux/6.18.21/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.18.21/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch
@@ -1,4 +1,4 @@
-From 3185c2165c0edccf2c6bae56ddd2a999df64cbac Mon Sep 17 00:00:00 2001
+From e21110ff341e8e98fd37682eb3697af164ab6a18 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/33] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
diff --git a/patches/linux/6.18.21/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.18.21/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch
@@ -1,4 +1,4 @@
-From d555f8b87056df9b903fe47275b15e491b351ac1 Mon Sep 17 00:00:00 2001
+From 707470adc86e9a099e3660c1c6c7a50ec38c2aa9 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/33] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
diff --git a/patches/linux/6.18.21/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.18.21/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch
@@ -1,4 +1,4 @@
-From e930f7a0eff1692b5d58ec284f9c7d0c31275ae9 Mon Sep 17 00:00:00 2001
+From 810739b589e9a754a62f2070abf39bab7c96122d 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/33] net: dsa: mv88e6xxx: collapse disabled state into
diff --git a/patches/linux/6.18.21/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.18.21/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch
@@ -1,4 +1,4 @@
-From c1c84af10118505091df62a950efb99690ed362b Mon Sep 17 00:00:00 2001
+From 33439041b14ff724f0d607df9bf46ae90415f493 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/33] net: dsa: mv88e6xxx: Only activate LAG offloading when
diff --git a/patches/linux/6.18.21/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.18.21/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch
@@ -1,4 +1,4 @@
-From 605da9ce56486f8f5580f7704116f8304461f1c3 Mon Sep 17 00:00:00 2001
+From 1c589a1949419a0f810a768f0d871d849c48073c 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/33] net: dsa: mv88e6xxx: Add LED support for 6393X
diff --git a/patches/linux/6.18.21/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch b/patches/linux/6.18.21/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch
@@ -1,4 +1,4 @@
-From e620a12a5832df077973ac483e4668a22527367e Mon Sep 17 00:00:00 2001
+From bc38784c6cece06ea7de222187024eade94d6cbd 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/33] wifi: brcmfmac: support deletion and recreation of
diff --git a/patches/linux/6.18.21/0030-wifi-brcmfmac-check-connection-state-before-querying.patch b/patches/linux/6.18.21/0030-wifi-brcmfmac-check-connection-state-before-querying.patch
@@ -1,4 +1,4 @@
-From 75b44164bdbdc132afad8603cbf9f331071fec3b Mon Sep 17 00:00:00 2001
+From 1b42e2f4929b011f0e0d7c8ec552970164811a98 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/33] wifi: brcmfmac: check connection state before querying
diff --git a/patches/linux/6.18.21/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch b/patches/linux/6.18.21/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch
@@ -1,4 +1,4 @@
-From 4cff83ac73c67f4f97d167fbe128cc82b7249767 Mon Sep 17 00:00:00 2001
+From 8de957dbd9fcb775b3fa27a0d396fd6f95aa9da8 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/33] wifi: brcmfmac: suppress log spam for
diff --git a/patches/linux/6.18.21/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch b/patches/linux/6.18.21/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch
@@ -1,4 +1,4 @@
-From c547b6205e3e30b9d3a9904223dbf634abd53177 Mon Sep 17 00:00:00 2001
+From 0a25079b3ae16423aaad78637ed6fc29b44283d9 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/33] wifi: brcmfmac: reduce log noise during AP to station
diff --git a/patches/linux/6.18.21/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch b/patches/linux/6.18.21/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch
@@ -1,4 +1,4 @@
-From 7781b27f599304a6cedd0aa24444ac946f8dfa9f Mon Sep 17 00:00:00 2001
+From 81cb8dc071332896b5d3c49f6edd8b8331b86f2f 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/33] net: phy: air_en8811h: add OF device table for
diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash
@@ -1,2 +1,2 @@
 # Calculated with utils/kernel-refresh.sh
-sha256   837a5abd98e46078a0ae1400e2daad89ece45cc3209037b09c2265dab2393553  linux-6.18.20.tar.xz
+sha256   1c38214fb137bae85b82b82537b5987358621b915ab2a8e4f09e60697c19474f  linux-6.18.21.tar.xz

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 4668726493784ba2516ed7a0895bca9d92c902d0 Mon Sep 17 00:00:00 2001`
	`1`	`+From 657a79b59e67bac4af66f63bcf740238af399aba 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/33] net: phy: marvell10g: Support firmware loading on`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From bc8058a8f55621f457277ea840c20cae1403dffa Mon Sep 17 00:00:00 2001`
	`1`	`+From 6684303b2262468f91f4aab0755a35f8dc2ee141 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/33] 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 dc7bb5be38924c26f498f67a52f9534f1fbe92d5 Mon Sep 17 00:00:00 2001`
	`1`	`+From ee1464a4becdb06df87ae167fb56d9ac1530512f 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/33] net: phy: marvell10g: Add LED support for 88X3310`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From dcbbc30a5c0be8a471df6177f8ec8a8f75a6b88b Mon Sep 17 00:00:00 2001`
	`1`	`+From cfe0f07454be8ab659b33fafd83a57b2d44f2fdf Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <tobias@waldekranz.com>`
`3`	`3`	`Date: Tue, 12 Dec 2023 09:51:05 +0100`
`4`	`4`	`Subject: [PATCH 04/33] net: phy: marvell10g: Support LEDs tied to a single`