From fcce71fe233aa45db40e0d0f073f4befe17ed31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 12 Aug 2025 11:19:51 +0200 Subject: [PATCH] Upgrade linux kernel to 6.12.41 (LTS) --- configs/aarch64_defconfig | 2 +- configs/aarch64_minimal_defconfig | 2 +- configs/r2s_defconfig | 2 +- configs/x86_64_defconfig | 2 +- configs/x86_64_minimal_defconfig | 2 +- doc/ChangeLog.md | 1 + ...e6xxx-Fix-timeout-on-waiting-for-PPU.patch | 4 +- ...x-Improve-indirect-register-access-p.patch | 4 +- ...x-Honor-ports-being-managed-via-in-b.patch | 4 +- ...x-Limit-rsvd2cpu-policy-to-user-port.patch | 4 +- ...dsa-mv88e6xxx-Add-LED-infrastructure.patch | 4 +- ...-mv88e6xxx-Add-LED-support-for-6393X.patch | 4 +- ...Use-tag-priority-as-initial-skb-prio.patch | 4 +- ...MDB-memberships-whose-L2-addresses-o.patch | 4 +- ...t-EtherType-based-priority-overrides.patch | 4 +- ...x-Support-EtherType-based-priority-o.patch | 4 +- ...a-mv88e6xxx-Add-mqprio-qdisc-support.patch | 4 +- ...x-Use-VLAN-prio-over-IP-when-both-ar.patch | 4 +- ...8e6xxx-Trap-locally-terminated-VLANs.patch | 4 +- ...0g-Support-firmware-loading-on-88X33.patch | 4 +- ...0g-Fix-power-up-when-strapped-to-sta.patch | 4 +- ...rvell10g-Add-LED-support-for-88X3310.patch | 4 +- ...0g-Support-LEDs-tied-to-a-single-med.patch | 4 +- ...phy-Do-not-resume-PHY-when-attaching.patch | 6 +- ...-classifying-unknown-multicast-as-mr.patch | 4 +- ...e-router-ports-when-forwarding-L2-mu.patch | 4 +- ...delay-for-applying-strict-multicast-.patch | 4 +- ...rentiate-MDB-additions-from-modifica.patch | 4 +- ...ie-tlv-Let-device-probe-even-when-TL.patch | 4 +- ...t-log-level-for-unauthorized-devices.patch | 4 +- ...x-collapse-disabled-state-into-block.patch | 4 +- ...x-Only-activate-LAG-offloading-when-.patch | 4 +- ...d-r8153b-support-for-link-activity-L.patch | 4 +- ...ek-mt7986a-rename-BPi-R3-ports-to-ma.patch | 72 +++++++++++++++++++ patches/linux/linux.hash | 2 +- 35 files changed, 134 insertions(+), 61 deletions(-) rename patches/linux/{6.12.35 => 6.12.41}/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch (88%) rename patches/linux/{6.12.35 => 6.12.41}/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch (90%) rename patches/linux/{6.12.35 => 6.12.41}/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch (96%) rename patches/linux/{6.12.35 => 6.12.41}/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch (91%) rename patches/linux/{6.12.35 => 6.12.41}/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch (95%) rename patches/linux/{6.12.35 => 6.12.41}/0009-net-dsa-Support-EtherType-based-priority-overrides.patch (96%) rename patches/linux/{6.12.35 => 6.12.41}/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch (97%) rename patches/linux/{6.12.35 => 6.12.41}/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch (95%) rename patches/linux/{6.12.35 => 6.12.41}/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch (97%) rename patches/linux/{6.12.35 => 6.12.41}/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch (97%) rename patches/linux/{6.12.35 => 6.12.41}/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch (92%) rename patches/linux/{6.12.35 => 6.12.41}/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch (99%) rename patches/linux/{6.12.35 => 6.12.41}/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch (94%) rename patches/linux/{6.12.35 => 6.12.41}/0018-net-phy-Do-not-resume-PHY-when-attaching.patch (85%) rename patches/linux/{6.12.35 => 6.12.41}/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch (90%) rename patches/linux/{6.12.35 => 6.12.41}/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch (98%) rename patches/linux/{6.12.35 => 6.12.41}/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch (96%) rename patches/linux/{6.12.35 => 6.12.41}/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch (92%) rename patches/linux/{6.12.35 => 6.12.41}/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch (93%) rename patches/linux/{6.12.35 => 6.12.41}/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch (91%) rename patches/linux/{6.12.35 => 6.12.41}/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch (97%) rename patches/linux/{6.12.35 => 6.12.41}/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch (91%) create mode 100644 patches/linux/6.12.41/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 44a5324d..41a09176 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" 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 index 504dec11..24e8eef3 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" 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/r2s_defconfig b/configs/r2s_defconfig index ef87f56a..1e674326 100644 --- a/configs/r2s_defconfig +++ b/configs/r2s_defconfig @@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig" diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index dc1525d1..0318d09c 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" 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 index e4295656..35229cf1 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" 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 index f1afbdb3..7962c2ae 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -8,6 +8,7 @@ All notable changes to the project are documented in this file. ### Changes - Upgrade Buildroot to 2025.02.5 (LTS) +- Upgrade Linux kernel to 6.12.41 (LTS) - Raspberry Pi 4 is now a part of the aarch64 image, as well as a SDcard image for initial deployments. diff --git a/patches/linux/6.12.35/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.41/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 88% rename from patches/linux/6.12.35/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.41/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index e4116566..6fb19ae4 100644 --- a/patches/linux/6.12.35/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.41/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,7 +1,7 @@ -From 072c2f0732bc1a55aaeb9b5319a71bb472e2fd7d Mon Sep 17 00:00:00 2001 +From 3c9420a26d0a733f957e0b0b5de418775848c53f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 -Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for +Subject: [PATCH 01/28] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on 6393X Organization: Wires diff --git a/patches/linux/6.12.35/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.41/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 98% rename from patches/linux/6.12.35/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.41/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index 62edfe8e..4ba5e0f3 100644 --- a/patches/linux/6.12.35/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.41/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,7 +1,7 @@ -From 7b18b787450759f1c2507c7b65c81c3686040c90 Mon Sep 17 00:00:00 2001 +From 5098f1a2c354298d076a2fd3b648a075d763b4d4 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 -Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access +Subject: [PATCH 02/28] net: dsa: mv88e6xxx: Improve indirect register access perf on 6393 Organization: Wires diff --git a/patches/linux/6.12.35/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.41/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 90% rename from patches/linux/6.12.35/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.41/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index 903e2bab..a8eec49c 100644 --- a/patches/linux/6.12.35/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.41/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,7 +1,7 @@ -From 379dd2a00dc647b034befead65b26e467e63ae75 Mon Sep 17 00:00:00 2001 +From ea391b706ca007c6b7ef5cb94eae03c8b062ebfc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 -Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via +Subject: [PATCH 03/28] net: dsa: mv88e6xxx: Honor ports being managed via in-band-status Organization: Wires diff --git a/patches/linux/6.12.35/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.41/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 96% rename from patches/linux/6.12.35/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.41/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index b9b5784a..f964aa54 100644 --- a/patches/linux/6.12.35/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.41/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,7 +1,7 @@ -From fd676f49b5aa5a1d372446be9ee01d1f126bcd54 Mon Sep 17 00:00:00 2001 +From d5dc80b6f8c94d2d96ef77c92a7bfcbf076b3851 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 -Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user +Subject: [PATCH 04/28] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user ports on 6393X Organization: Wires diff --git a/patches/linux/6.12.35/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.41/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 98% rename from patches/linux/6.12.35/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.41/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index d6a91029..396e7b23 100644 --- a/patches/linux/6.12.35/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.41/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,7 +1,7 @@ -From 2aeb87ab82b7b9fb37e6b1c830dec5374158aa5d Mon Sep 17 00:00:00 2001 +From 3d707ace92c9b68c2fe3c41ce8a1c494066da17c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 -Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure +Subject: [PATCH 05/28] net: dsa: mv88e6xxx: Add LED infrastructure Organization: Wires Parse DT for LEDs and register them for devices that support it, diff --git a/patches/linux/6.12.35/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.41/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 98% rename from patches/linux/6.12.35/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.41/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 65aade8f..e8b5b3d6 100644 --- a/patches/linux/6.12.35/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.41/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,7 +1,7 @@ -From 3de6f58239d6b09c3fe1e0978a556481be8f3a95 Mon Sep 17 00:00:00 2001 +From ffad61ab5c619bcedda386797e9ae0bf4054efa4 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 -Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X +Subject: [PATCH 06/28] net: dsa: mv88e6xxx: Add LED support for 6393X Organization: Wires Trigger support: diff --git a/patches/linux/6.12.35/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.41/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 91% rename from patches/linux/6.12.35/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.41/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 9103775f..1c3bfdf2 100644 --- a/patches/linux/6.12.35/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.41/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,7 +1,7 @@ -From f28803088158ddf97186f143f4bdc516e42e9354 Mon Sep 17 00:00:00 2001 +From d2b754cbbe19aa8f1d069fa3c2a6823bee8c2920 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 -Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial +Subject: [PATCH 07/28] net: dsa: tag_dsa: Use tag priority as initial skb->priority Organization: Wires diff --git a/patches/linux/6.12.35/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.41/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 95% rename from patches/linux/6.12.35/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.41/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index 666bf47d..46c24587 100644 --- a/patches/linux/6.12.35/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.41/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,7 +1,7 @@ -From bbbf265610459ec49afcde923d1872ca3e2ad679 Mon Sep 17 00:00:00 2001 +From 98b74c2e6fac87118c97b676c426bb7c8effccbe Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 -Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses +Subject: [PATCH 08/28] net: dsa: Support MDB memberships whose L2 addresses overlap Organization: Wires diff --git a/patches/linux/6.12.35/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.41/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 96% rename from patches/linux/6.12.35/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.41/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index 57e0944a..8471144b 100644 --- a/patches/linux/6.12.35/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.41/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,7 +1,7 @@ -From 797ed124853b8f0ef6d110e1633be2637c97c31d Mon Sep 17 00:00:00 2001 +From 7542f09844def85bd58033bb37bb6e6cc6ff697d Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 -Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides +Subject: [PATCH 09/28] net: dsa: Support EtherType based priority overrides Organization: Wires --- diff --git a/patches/linux/6.12.35/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.41/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 98% rename from patches/linux/6.12.35/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.41/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index 7ffd1e86..3ce43a0e 100644 --- a/patches/linux/6.12.35/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.41/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,7 +1,7 @@ -From ea2d865a2101317e22c60143e891d643feac8e8c Mon Sep 17 00:00:00 2001 +From be63e969dc9bd07c799c6b7a3b582f574b87feee Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 -Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority +Subject: [PATCH 10/28] net: dsa: mv88e6xxx: Support EtherType based priority overrides Organization: Wires diff --git a/patches/linux/6.12.35/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.41/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 97% rename from patches/linux/6.12.35/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.41/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index f547b4bd..85b83cc4 100644 --- a/patches/linux/6.12.35/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.41/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,7 +1,7 @@ -From a239baf492b7c4a1280562bb9478006627b73036 Mon Sep 17 00:00:00 2001 +From 3f51b144a86bd1b7f14c096898d3f1eda2348694 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 -Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support +Subject: [PATCH 11/28] net: dsa: mv88e6xxx: Add mqprio qdisc support Organization: Wires Add support for attaching mqprio qdisc's to mv88e6xxx ports and use diff --git a/patches/linux/6.12.35/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.41/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 95% rename from patches/linux/6.12.35/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.41/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index 3f52760b..6223ab53 100644 --- a/patches/linux/6.12.35/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.41/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,7 +1,7 @@ -From 60ac4461cef9b2024df52c23a040b100093ba1d7 Mon Sep 17 00:00:00 2001 +From 66b772317403bb070a3410333cb99288df23875f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 -Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both +Subject: [PATCH 12/28] net: dsa: mv88e6xxx: Use VLAN prio over IP when both are available Organization: Wires diff --git a/patches/linux/6.12.35/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.41/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 97% rename from patches/linux/6.12.35/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.41/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index 391957ec..d325678d 100644 --- a/patches/linux/6.12.35/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.41/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,7 +1,7 @@ -From d3b20e07514928830034d4af2eb7660bfcacc1e0 Mon Sep 17 00:00:00 2001 +From ff65351a4192e69eda3ba715424feb63596e52d7 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 -Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated +Subject: [PATCH 13/28] [FIX] net: dsa: mv88e6xxx: Trap locally terminated VLANs Organization: Wires diff --git a/patches/linux/6.12.35/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.41/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 97% rename from patches/linux/6.12.35/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.41/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index c67abf61..d772e396 100644 --- a/patches/linux/6.12.35/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.41/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,7 +1,7 @@ -From b4870c7df5d6659da439e8f1322dd5496a15445e Mon Sep 17 00:00:00 2001 +From 65f7b75b779691053f1993233e104c7bcd57ec72 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 -Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on +Subject: [PATCH 14/28] net: phy: marvell10g: Support firmware loading on 88X3310 Organization: Wires diff --git a/patches/linux/6.12.35/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.41/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 92% rename from patches/linux/6.12.35/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.41/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index 229d5085..904f05ea 100644 --- a/patches/linux/6.12.35/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.41/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,7 +1,7 @@ -From 6161b59334064ebfc0b80b0214fa12e6d042400e Mon Sep 17 00:00:00 2001 +From db990b4ffc543a2234116d47a5e85ee95b05b5e9 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 -Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to +Subject: [PATCH 15/28] net: phy: marvell10g: Fix power-up when strapped to start powered down Organization: Wires diff --git a/patches/linux/6.12.35/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.41/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 99% rename from patches/linux/6.12.35/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.41/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index 573139cf..926c4ad8 100644 --- a/patches/linux/6.12.35/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.41/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,7 +1,7 @@ -From 403075caa172cf8e5c50346a86698b0a909a9263 Mon Sep 17 00:00:00 2001 +From c3851e92b6cf9ed1bd4c3d8b2b33d10f6aadbcf0 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 -Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310 +Subject: [PATCH 16/28] net: phy: marvell10g: Add LED support for 88X3310 Organization: Wires Pickup the LEDs from the state in which the hardware reset or diff --git a/patches/linux/6.12.35/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.41/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 94% rename from patches/linux/6.12.35/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.41/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index e1e7090a..b65f5805 100644 --- a/patches/linux/6.12.35/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.41/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,7 +1,7 @@ -From 84ca381445809f1d796c461a5b085ff4a3b7f93e Mon Sep 17 00:00:00 2001 +From d87176a8d2655d2bf049744626845fa4e79e2695 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 -Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single +Subject: [PATCH 17/28] net: phy: marvell10g: Support LEDs tied to a single media side Organization: Wires diff --git a/patches/linux/6.12.35/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.41/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 85% rename from patches/linux/6.12.35/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.41/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index e164cb46..d8db20ad 100644 --- a/patches/linux/6.12.35/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.41/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,7 +1,7 @@ -From 47eddfb80fd6bbbc186b0d8a93697c36840168e8 Mon Sep 17 00:00:00 2001 +From 0b37ca9039fa95d270230206f8d5f68d68fc41b3 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 -Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching +Subject: [PATCH 18/28] net: phy: Do not resume PHY when attaching Organization: Wires The PHY should not start negotiating with its link-partner until @@ -20,7 +20,7 @@ administratively down. 1 file changed, 1 deletion(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c -index 13dea33d86ff..25d0face304a 100644 +index 834624a61060..d09872e1ac4e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1661,7 +1661,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, diff --git a/patches/linux/6.12.35/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.41/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 98% rename from patches/linux/6.12.35/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.41/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index e5fb7c89..ead8f3f0 100644 --- a/patches/linux/6.12.35/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.41/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,7 +1,7 @@ -From 761e5315fc2bac3809258e9719efd1475a73ac14 Mon Sep 17 00:00:00 2001 +From 0cd06cba7a3e9cfd4efa37db266a8b5d5b3b19fa Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 -Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as +Subject: [PATCH 19/28] net: bridge: avoid classifying unknown multicast as mrouters_only Organization: Wires diff --git a/patches/linux/6.12.35/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.41/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 90% rename from patches/linux/6.12.35/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.41/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 3ce52078..b0d4e7ff 100644 --- a/patches/linux/6.12.35/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.41/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,7 +1,7 @@ -From 41c6eeb5c4042027eac70243dd28bcaf963ac6b8 Mon Sep 17 00:00:00 2001 +From c5ee32858f05d987f876725030d8b7655244fb70 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 -Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2 +Subject: [PATCH 20/28] net: bridge: Ignore router ports when forwarding L2 multicast Organization: Wires diff --git a/patches/linux/6.12.35/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.41/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 98% rename from patches/linux/6.12.35/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.41/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 3b7ee370..f15ef64d 100644 --- a/patches/linux/6.12.35/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.41/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,7 +1,7 @@ -From f831362d0a5717cbb18a9173defca6ec4d886377 Mon Sep 17 00:00:00 2001 +From 97715025f5040138779c7cb384d51a7fa6f224b9 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 -Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast +Subject: [PATCH 21/28] net: bridge: drop delay for applying strict multicast filtering Organization: Wires diff --git a/patches/linux/6.12.35/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.41/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 96% rename from patches/linux/6.12.35/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.41/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index 66689a8d..9f921ea5 100644 --- a/patches/linux/6.12.35/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.41/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,7 +1,7 @@ -From 1e0eb62180058e98c7d18e3e04540925801e34b5 Mon Sep 17 00:00:00 2001 +From 85369df28e76f3a4f5ab714a163c7f7c6d54a7a1 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 -Subject: [PATCH 22/27] net: bridge: Differentiate MDB additions from +Subject: [PATCH 22/28] net: bridge: Differentiate MDB additions from modifications Organization: Wires diff --git a/patches/linux/6.12.35/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.41/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 92% rename from patches/linux/6.12.35/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.41/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index 473cdf7c..3f6710c7 100644 --- a/patches/linux/6.12.35/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.41/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,7 +1,7 @@ -From 86a738ca46e019a8913d100138d8972681a65b4b Mon Sep 17 00:00:00 2001 +From deeaa6e29a24955839968ff1496e63cf19c68ce3 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 -Subject: [PATCH 23/27] nvmem: layouts: onie-tlv: Let device probe even when +Subject: [PATCH 23/28] nvmem: layouts: onie-tlv: Let device probe even when TLV is invalid Organization: Wires diff --git a/patches/linux/6.12.35/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.41/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 93% rename from patches/linux/6.12.35/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.41/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index fe52fbb6..96c7b547 100644 --- a/patches/linux/6.12.35/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.41/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,7 +1,7 @@ -From df19ceb2579bd87d58f2caab739d8ba678785f5c Mon Sep 17 00:00:00 2001 +From 9baf482d227725038fb3cb45c8867f572834fdde Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 -Subject: [PATCH 24/27] usb: core: adjust log level for unauthorized devices +Subject: [PATCH 24/28] usb: core: adjust log level for unauthorized devices Organization: Wires The fact that a USB device currently is not authorized is not an error, diff --git a/patches/linux/6.12.35/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.41/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 91% rename from patches/linux/6.12.35/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.12.41/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index eacaab01..0c288505 100644 --- a/patches/linux/6.12.35/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.12.41/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,7 +1,7 @@ -From eea7cb00b2e657445de9913736ff38b99ed0f9a5 Mon Sep 17 00:00:00 2001 +From 11833b5d736d3ca6ccad3b7b3cc859060a20523f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 -Subject: [PATCH 25/27] net: dsa: mv88e6xxx: collapse disabled state into +Subject: [PATCH 25/28] net: dsa: mv88e6xxx: collapse disabled state into blocking Organization: Wires diff --git a/patches/linux/6.12.35/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.41/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 97% rename from patches/linux/6.12.35/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.12.41/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index a128d33b..e4edf4a5 100644 --- a/patches/linux/6.12.35/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.12.41/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,7 +1,7 @@ -From 0e24579e619a9d3ebb03293822092e03d16d6ad2 Mon Sep 17 00:00:00 2001 +From 0ee7fad47096411012f1f6b2ee6d0977e53f82b6 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 -Subject: [PATCH 26/27] net: dsa: mv88e6xxx: Only activate LAG offloading when +Subject: [PATCH 26/28] net: dsa: mv88e6xxx: Only activate LAG offloading when bridged Organization: Wires diff --git a/patches/linux/6.12.35/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.12.41/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch similarity index 91% rename from patches/linux/6.12.35/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch rename to patches/linux/6.12.41/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch index 76ea5ebe..540068ce 100644 --- a/patches/linux/6.12.35/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch +++ b/patches/linux/6.12.41/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch @@ -1,7 +1,7 @@ -From 73b60d31a3318344428842c7368b2f1eb0c05596 Mon Sep 17 00:00:00 2001 +From 88b269d1202c6258122074c46da6a473ddbecd68 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 11 Aug 2024 11:27:35 +0200 -Subject: [PATCH 27/27] net: usb: r8152: add r8153b support for link/activity +Subject: [PATCH 27/28] net: usb: r8152: add r8153b support for link/activity LEDs Organization: Wires diff --git a/patches/linux/6.12.41/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch b/patches/linux/6.12.41/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch new file mode 100644 index 00000000..2b36e1d8 --- /dev/null +++ b/patches/linux/6.12.41/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch @@ -0,0 +1,72 @@ +From 32f3c3f3d5ed0548190fbdd2c430d1592ce5ff09 Mon Sep 17 00:00:00 2001 +From: Joachim Wiberg +Date: Sun, 10 Aug 2025 18:52:54 +0200 +Subject: [PATCH 28/28] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to + match case +Organization: Wires + +For ref. see: https://wiki.banana-pi.org/File:Bpi-r3_Metal_case.jpg + +Also, comment out gpio-keys (reset and wps) since they clash with with +the PCIe controller. + +Signed-off-by: Joachim Wiberg +--- + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts +index ed79ad1ae871..1c7c666e3173 100644 +--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts ++++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts +@@ -46,7 +46,7 @@ fan: pwm-fan { + pwms = <&pwm 0 10000>; + status = "okay"; + }; +- ++/* + gpio-keys { + compatible = "gpio-keys"; + +@@ -62,7 +62,7 @@ wps-key { + gpios = <&pio 10 GPIO_ACTIVE_LOW>; + }; + }; +- ++*/ + /* i2c of the left SFP cage (wan) */ + i2c_sfp1: i2c-gpio-0 { + compatible = "i2c-gpio"; +@@ -418,27 +418,27 @@ port@0 { + + port@1 { + reg = <1>; +- label = "lan0"; ++ label = "lan1"; + }; + + port@2 { + reg = <2>; +- label = "lan1"; ++ label = "lan2"; + }; + + port@3 { + reg = <3>; +- label = "lan2"; ++ label = "lan3"; + }; + + port@4 { + reg = <4>; +- label = "lan3"; ++ label = "lan4"; + }; + + port5: port@5 { + reg = <5>; +- label = "lan4"; ++ label = "sfp2"; + phy-mode = "2500base-x"; + sfp = <&sfp2>; + managed = "in-band-status"; diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash index 35b5f291..cc9c2da9 100644 --- a/patches/linux/linux.hash +++ b/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Calculated with ../utils/kernel-refresh.sh -sha256 05f4e0b01dde578c3328eb539d305cccec7b84e939f6dd5f21fdaf5f313da748 linux-6.12.35.tar.xz +sha256 6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27 linux-6.12.41.tar.xz