diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 09302f1e..5f0c5da6 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.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.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 index ee8ff4c8..d083752a 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.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.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/x86_64_defconfig b/configs/x86_64_defconfig index 475df6f9..4f43477c 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.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.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 index e82b41bc..76b2c364 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_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.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.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/doc/ChangeLog.md b/doc/ChangeLog.md index 94e80a75..a15db37b 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -9,7 +9,7 @@ All notable changes to the project are documented in this file. **News:** this release is the first with the new Buildroot LTS (2025.02) ### Changes - - Upgrade Linux kernel to 6.12.19 (LTS) + - Upgrade Linux kernel to 6.12.21 (LTS) - Upgrade Buildroot to 2025.02.0 (LTS) ### Fixes diff --git a/patches/linux/6.12.19/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 91% rename from patches/linux/6.12.19/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index 143e9212..9ee6b61e 100644 --- a/patches/linux/6.12.19/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,4 +1,4 @@ -From f764a533ea2591fe8cbdb23432935e67e7df273a Mon Sep 17 00:00:00 2001 +From 774cf1d3f5b9cfac247c3efcf4eed39d06c675dc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 Subject: [PATCH 01/26] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for @@ -18,7 +18,7 @@ Signed-off-by: Mattias Walström 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 284270a4ade1..1f0b0c07ed9d 100644 +index 5aeecfab9630..2565277582c5 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -86,7 +86,7 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val) diff --git a/patches/linux/6.12.19/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 97% rename from patches/linux/6.12.19/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index 6cdd2f2a..09636baa 100644 --- a/patches/linux/6.12.19/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,4 +1,4 @@ -From f5833370f8886f6c7e247752179d6c98c7b55d87 Mon Sep 17 00:00:00 2001 +From 6bd6c3c49c438e35d61669879b64b6c4a00d1a19 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 Subject: [PATCH 02/26] net: dsa: mv88e6xxx: Improve indirect register access @@ -27,10 +27,10 @@ Signed-off-by: Mattias Walström 5 files changed, 119 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 1f0b0c07ed9d..f9d892d036be 100644 +index 2565277582c5..7ba492ee5c86 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6472,6 +6472,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip) +@@ -6502,6 +6502,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip) /* Update the compatible info with the probed one */ chip->info = info; diff --git a/patches/linux/6.12.19/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 93% rename from patches/linux/6.12.19/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index 49e2e363..be36d84b 100644 --- a/patches/linux/6.12.19/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,4 +1,4 @@ -From 01230d945df8d0c27058a02f53e92a04ac3fd1bf Mon Sep 17 00:00:00 2001 +From 02bb753cee9b24a3a1bcbcd15c3729144200eafc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 Subject: [PATCH 03/26] net: dsa: mv88e6xxx: Honor ports being managed via @@ -23,7 +23,7 @@ Signed-off-by: Mattias Walström 1 file changed, 6 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index f9d892d036be..98bd635b0ba9 100644 +index 7ba492ee5c86..cdf48fae0623 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -964,6 +964,9 @@ static void mv88e6xxx_mac_link_down(struct phylink_config *config, diff --git a/patches/linux/6.12.19/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 98% rename from patches/linux/6.12.19/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index b29a8b1f..1d7da44e 100644 --- a/patches/linux/6.12.19/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,4 +1,4 @@ -From 28aba5404165db8a16fabbfa00ae201713aca7ff Mon Sep 17 00:00:00 2001 +From 6cbb6a0a54d81ff5b117b023ac7e251ab1e9c556 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 Subject: [PATCH 04/26] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user diff --git a/patches/linux/6.12.19/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 98% rename from patches/linux/6.12.19/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index 7073a89f..02f5e5fd 100644 --- a/patches/linux/6.12.19/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,4 +1,4 @@ -From 0f20677a9c7ad86776b1edb0421c3e3a38d81b11 Mon Sep 17 00:00:00 2001 +From 86b1608084c6e9676db0641f31203d8067893470 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 Subject: [PATCH 05/26] net: dsa: mv88e6xxx: Add LED infrastructure @@ -34,7 +34,7 @@ index a9a9651187db..6720d9303914 100644 mv88e6xxx-objs += pcs-6352.o mv88e6xxx-objs += pcs-639x.o diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 98bd635b0ba9..97cebc490fac 100644 +index cdf48fae0623..0a7858280903 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -37,6 +37,7 @@ @@ -45,7 +45,7 @@ index 98bd635b0ba9..97cebc490fac 100644 #include "phy.h" #include "port.h" #include "ptp.h" -@@ -4115,7 +4116,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port) +@@ -4145,7 +4146,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port) return err; } diff --git a/patches/linux/6.12.19/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 98% rename from patches/linux/6.12.19/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 5c35123f..43f50589 100644 --- a/patches/linux/6.12.19/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,4 +1,4 @@ -From 5860d2282f24bdce9ddc973c8825d2be78133afe Mon Sep 17 00:00:00 2001 +From 5496a27ee644f72b721eba0e8c057efb65ee445f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 Subject: [PATCH 06/26] net: dsa: mv88e6xxx: Add LED support for 6393X @@ -22,10 +22,10 @@ Signed-off-by: Mattias Walström 5 files changed, 272 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 97cebc490fac..e8edf3970940 100644 +index 0a7858280903..cd746bea31be 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5627,6 +5627,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { +@@ -5657,6 +5657,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6390_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, diff --git a/patches/linux/6.12.19/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 96% rename from patches/linux/6.12.19/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 01c8f4a6..55bf9d55 100644 --- a/patches/linux/6.12.19/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,4 +1,4 @@ -From dee2fc8403b9de020f78d30c3a74e19136b0b357 Mon Sep 17 00:00:00 2001 +From a0e2ebe61422d5e0e330022a2a38a31c049a4407 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 Subject: [PATCH 07/26] net: dsa: tag_dsa: Use tag priority as initial diff --git a/patches/linux/6.12.19/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 97% rename from patches/linux/6.12.19/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index eb2e397d..086836ac 100644 --- a/patches/linux/6.12.19/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,4 +1,4 @@ -From 2d0b9101c119b6fe47d47d35f0be910f5490df4b Mon Sep 17 00:00:00 2001 +From a88679c946d5163eb0e30718109c18ddbbd8cfc6 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 Subject: [PATCH 08/26] net: dsa: Support MDB memberships whose L2 addresses diff --git a/patches/linux/6.12.19/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 98% rename from patches/linux/6.12.19/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index 3f20a8ca..0d8a0586 100644 --- a/patches/linux/6.12.19/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,4 +1,4 @@ -From 32fe9b19aea6ed385305edd4ab289f16c4e79fa4 Mon Sep 17 00:00:00 2001 +From c6528f18fbafef721c18e546aa0b60c1b1d772c6 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 Subject: [PATCH 09/26] net: dsa: Support EtherType based priority overrides diff --git a/patches/linux/6.12.19/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 97% rename from patches/linux/6.12.19/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index b4948d8e..c1c7a720 100644 --- a/patches/linux/6.12.19/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,4 +1,4 @@ -From 48e81c31821e753af8220344806aba67490ed64c Mon Sep 17 00:00:00 2001 +From bc41b93b365694ac36a19565270b8deda3b8cb79 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 Subject: [PATCH 10/26] net: dsa: mv88e6xxx: Support EtherType based priority @@ -19,7 +19,7 @@ Signed-off-by: Mattias Walström 6 files changed, 207 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index e8edf3970940..3151df2a27c7 100644 +index cd746bea31be..e05caeabdc85 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1715,6 +1715,11 @@ static int mv88e6xxx_rmu_setup(struct mv88e6xxx_chip *chip) @@ -34,7 +34,7 @@ index e8edf3970940..3151df2a27c7 100644 if (chip->info->ops->pot_clear) return chip->info->ops->pot_clear(chip); -@@ -3386,6 +3391,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3416,6 +3421,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) chip->ports[port].chip = chip; chip->ports[port].port = port; @@ -42,7 +42,7 @@ index e8edf3970940..3151df2a27c7 100644 err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED, SPEED_UNFORCED, DUPLEX_UNFORCED, -@@ -6532,6 +6538,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev) +@@ -6562,6 +6568,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev) chip->dev = dev; mutex_init(&chip->reg_lock); @@ -50,7 +50,7 @@ index e8edf3970940..3151df2a27c7 100644 INIT_LIST_HEAD(&chip->mdios); idr_init(&chip->policies); INIT_LIST_HEAD(&chip->msts); -@@ -7064,6 +7071,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, +@@ -7101,6 +7108,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, return err_sync ? : err_pvt; } @@ -112,7 +112,7 @@ index e8edf3970940..3151df2a27c7 100644 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = { .mac_select_pcs = mv88e6xxx_mac_select_pcs, .mac_prepare = mv88e6xxx_mac_prepare, -@@ -7133,6 +7195,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { +@@ -7170,6 +7232,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_change = mv88e6xxx_crosschip_lag_change, .crosschip_lag_join = mv88e6xxx_crosschip_lag_join, .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, diff --git a/patches/linux/6.12.19/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 94% rename from patches/linux/6.12.19/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index 02b54b40..b09f3cdb 100644 --- a/patches/linux/6.12.19/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,4 +1,4 @@ -From a96464b50f25bb90c7d0dd0bbbde0db2d95dde98 Mon Sep 17 00:00:00 2001 +From 70c1d59448db0ec88c07fa4ff5748b0df740a8d2 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 Subject: [PATCH 11/26] net: dsa: mv88e6xxx: Add mqprio qdisc support @@ -35,7 +35,7 @@ Signed-off-by: Mattias Walström 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 3151df2a27c7..f50ad71bb28b 100644 +index e05caeabdc85..ad997818047e 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -31,6 +31,7 @@ @@ -46,7 +46,7 @@ index 3151df2a27c7..f50ad71bb28b 100644 #include "chip.h" #include "devlink.h" -@@ -7126,6 +7127,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, +@@ -7163,6 +7164,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, return err; } @@ -115,7 +115,7 @@ index 3151df2a27c7..f50ad71bb28b 100644 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = { .mac_select_pcs = mv88e6xxx_mac_select_pcs, .mac_prepare = mv88e6xxx_mac_prepare, -@@ -7197,6 +7260,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { +@@ -7234,6 +7297,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, .port_add_etype_prio = mv88e6xxx_port_add_etype_prio, .port_del_etype_prio = mv88e6xxx_port_del_etype_prio, @@ -123,7 +123,7 @@ index 3151df2a27c7..f50ad71bb28b 100644 }; static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) -@@ -7223,6 +7287,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) +@@ -7260,6 +7324,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) */ ds->num_lag_ids = mv88e6xxx_has_lag(chip) ? 16 : 0; diff --git a/patches/linux/6.12.19/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 91% rename from patches/linux/6.12.19/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index 30faff38..e18bdc34 100644 --- a/patches/linux/6.12.19/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,4 +1,4 @@ -From e3e151b8d21cee498f838690158f2059b64d1eeb Mon Sep 17 00:00:00 2001 +From c3721cb1cccf3c8fe18bea05c9ad20e7082291bd Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 Subject: [PATCH 12/26] net: dsa: mv88e6xxx: Use VLAN prio over IP when both @@ -32,10 +32,10 @@ Signed-off-by: Mattias Walström 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index f50ad71bb28b..2a46bf5f3da8 100644 +index ad997818047e..40e8d2018fee 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3402,9 +3402,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3432,9 +3432,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) /* Port Control: disable Drop-on-Unlock, disable Drop-on-Lock, * disable Header mode, enable IGMP/MLD snooping, disable VLAN @@ -52,7 +52,7 @@ index f50ad71bb28b..2a46bf5f3da8 100644 * * If this is the CPU link, use DSA or EDSA tagging depending * on which tagging mode was configured. -@@ -3415,6 +3419,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3445,6 +3449,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) * forwarding of unknown unicasts and multicasts. */ reg = MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP | diff --git a/patches/linux/6.12.19/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 90% rename from patches/linux/6.12.19/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index e0909e60..eff13434 100644 --- a/patches/linux/6.12.19/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,4 +1,4 @@ -From 83feadaef63052c98987bfb6d6623a55a095f852 Mon Sep 17 00:00:00 2001 +From 373d60426de6d19fd668e1e0b599ca430f351a18 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 Subject: [PATCH 13/26] [FIX] net: dsa: mv88e6xxx: Trap locally terminated @@ -36,10 +36,10 @@ Signed-off-by: Mattias Walström 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 2a46bf5f3da8..785cd3d0e2b1 100644 +index 40e8d2018fee..30f8a5388733 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2631,7 +2631,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port, +@@ -2654,7 +2654,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port, } static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port, @@ -48,7 +48,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 { const u8 non_member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER; struct mv88e6xxx_vtu_entry vlan; -@@ -2643,9 +2643,7 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port, +@@ -2666,9 +2666,7 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port, if (!vlan.valid) { memset(&vlan, 0, sizeof(vlan)); @@ -59,7 +59,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 err = mv88e6xxx_atu_new(chip, &vlan.fid); if (err) -@@ -2668,6 +2666,9 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port, +@@ -2691,6 +2689,9 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port, if (err) return err; } else if (vlan.member[port] != member) { @@ -69,7 +69,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 vlan.member[port] = member; err = mv88e6xxx_vtu_loadpurge(chip, &vlan); -@@ -2714,7 +2715,8 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port, +@@ -2737,7 +2738,8 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port, mv88e6xxx_reg_lock(chip); @@ -79,7 +79,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 if (err) { dev_err(ds->dev, "p%d: failed to add VLAN %d%c\n", port, vlan->vid, untagged ? 'u' : 't'); -@@ -3454,14 +3456,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3484,14 +3486,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) if (err) return err; @@ -104,7 +104,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 chip->info->ops->port_set_policy) { err = chip->info->ops->port_set_policy(chip, port, MV88E6XXX_POLICY_MAPPING_VTU, -@@ -3491,7 +3496,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3521,7 +3526,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) */ err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_STANDALONE, MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED, @@ -113,7 +113,7 @@ index 2a46bf5f3da8..785cd3d0e2b1 100644 if (err) return err; -@@ -3505,7 +3510,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3535,7 +3540,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) */ err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_BRIDGED, MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED, diff --git a/patches/linux/6.12.19/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 99% rename from patches/linux/6.12.19/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index 923139f6..a998e7b4 100644 --- a/patches/linux/6.12.19/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,4 +1,4 @@ -From 437617d2b776e2e43a5b3f4bdfe30f845581f915 Mon Sep 17 00:00:00 2001 +From a6368c60ac6ae2e0d97ac571b6506aa09becbb71 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 Subject: [PATCH 14/26] net: phy: marvell10g: Support firmware loading on diff --git a/patches/linux/6.12.19/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 96% rename from patches/linux/6.12.19/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index cb111701..c9d48ac1 100644 --- a/patches/linux/6.12.19/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,4 +1,4 @@ -From 8b874adf02dc4434304c3d703c49a38676750b54 Mon Sep 17 00:00:00 2001 +From 550dd1b443cf9d054f2a523088fbe22b215e07cb Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 Subject: [PATCH 15/26] net: phy: marvell10g: Fix power-up when strapped to diff --git a/patches/linux/6.12.19/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 99% rename from patches/linux/6.12.19/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index e5268076..9d41f9b0 100644 --- a/patches/linux/6.12.19/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,4 +1,4 @@ -From 1384c69ba614288a33d927fe6b2a78bdf5a55fa3 Mon Sep 17 00:00:00 2001 +From 9ca4c28ccf7857a36db8dd3c37dcd005222bdb78 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 Subject: [PATCH 16/26] net: phy: marvell10g: Add LED support for 88X3310 diff --git a/patches/linux/6.12.19/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 97% rename from patches/linux/6.12.19/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index a0d33d75..d96d8b3b 100644 --- a/patches/linux/6.12.19/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,4 +1,4 @@ -From 8b45165f8aaeeef2088f8246a13127fa49d382b6 Mon Sep 17 00:00:00 2001 +From 69f9bda6cab34556e67a096c282eee7337f97f26 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 Subject: [PATCH 17/26] net: phy: marvell10g: Support LEDs tied to a single diff --git a/patches/linux/6.12.19/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 95% rename from patches/linux/6.12.19/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index 61b3fa0f..eb76d7bc 100644 --- a/patches/linux/6.12.19/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,4 +1,4 @@ -From 3237ce7378e0ce25950cbfdc323c6e27afd30d86 Mon Sep 17 00:00:00 2001 +From f70be42f0ee50cda8c1cde14442ea8285c01834b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 Subject: [PATCH 18/26] net: phy: Do not resume PHY when attaching diff --git a/patches/linux/6.12.19/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 99% rename from patches/linux/6.12.19/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index 93e7d931..70e04c61 100644 --- a/patches/linux/6.12.19/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,4 +1,4 @@ -From df4cb199742045e6a21eb2b5a6d8700d8137b750 Mon Sep 17 00:00:00 2001 +From 17d6f3f6a7429ae635d0359b39da2e173c403fdf Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 Subject: [PATCH 19/26] net: bridge: avoid classifying unknown multicast as diff --git a/patches/linux/6.12.19/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 95% rename from patches/linux/6.12.19/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 5ef7805c..305c64b4 100644 --- a/patches/linux/6.12.19/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,4 +1,4 @@ -From 12d9718c23d93a11f8af9e06fd21f0b397fc2622 Mon Sep 17 00:00:00 2001 +From 27ca82c96a6bcd560e908eed17fc24126e8051a6 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 Subject: [PATCH 20/26] net: bridge: Ignore router ports when forwarding L2 diff --git a/patches/linux/6.12.19/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 99% rename from patches/linux/6.12.19/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 48368ef6..ced616e6 100644 --- a/patches/linux/6.12.19/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,4 +1,4 @@ -From 9528044ea737f1bc2e3f270fd06759f8106416fb Mon Sep 17 00:00:00 2001 +From bbbb4f7460efeaf057d37d837cae79a565a6d406 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 Subject: [PATCH 21/26] net: bridge: drop delay for applying strict multicast diff --git a/patches/linux/6.12.19/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 98% rename from patches/linux/6.12.19/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index 26d53e7d..7a70e419 100644 --- a/patches/linux/6.12.19/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,4 +1,4 @@ -From 99883b8acb649ede552682262ef1f7854e1176d2 Mon Sep 17 00:00:00 2001 +From 7c751c24428060c3e87f164eb2a054db410f4b0d Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 Subject: [PATCH 22/26] net: bridge: Differentiate MDB additions from diff --git a/patches/linux/6.12.19/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 96% rename from patches/linux/6.12.19/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index 723e252f..86eb7023 100644 --- a/patches/linux/6.12.19/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,4 +1,4 @@ -From d0287cda11350f46d39931912f40cf2e838b7356 Mon Sep 17 00:00:00 2001 +From db0d727f6cc90ccea2378d876329c151db1670dc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 Subject: [PATCH 23/26] nvmem: layouts: onie-tlv: Let device probe even when diff --git a/patches/linux/6.12.19/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 96% rename from patches/linux/6.12.19/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index a24d25d7..c418e83a 100644 --- a/patches/linux/6.12.19/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,4 +1,4 @@ -From d0eb9e5b7ae3487315a231cf5cd5d234afce6ab0 Mon Sep 17 00:00:00 2001 +From ed58f4b6e7344bdefceb7ac31d1c769a6d127827 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 Subject: [PATCH 24/26] usb: core: adjust log level for unauthorized devices diff --git a/patches/linux/6.12.19/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 96% rename from patches/linux/6.12.19/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index c5b593bd..391528fa 100644 --- a/patches/linux/6.12.19/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,4 +1,4 @@ -From 6db6493fbc8b5e8d16ee51bf54b8186319206a28 Mon Sep 17 00:00:00 2001 +From e7f7ae788680b4ec73af736453ec4afeb34d9842 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 Subject: [PATCH 25/26] net: dsa: mv88e6xxx: collapse disabled state into diff --git a/patches/linux/6.12.19/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 91% rename from patches/linux/6.12.19/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index 733d9b85..8bbd6956 100644 --- a/patches/linux/6.12.19/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,4 +1,4 @@ -From 69630914e982d5ac1ddde9b36798d1f80f6d1e4d Mon Sep 17 00:00:00 2001 +From 823687aa03d866f3b76b5e40e35fa56c7f6f4492 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 Subject: [PATCH 26/26] net: dsa: mv88e6xxx: Only activate LAG offloading when @@ -56,10 +56,10 @@ Signed-off-by: Mattias Walström 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 785cd3d0e2b1..37e79d52c175 100644 +index 30f8a5388733..c1f8adaa008a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3065,6 +3065,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, +@@ -3095,6 +3095,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack) { struct mv88e6xxx_chip *chip = ds->priv; @@ -67,7 +67,7 @@ index 785cd3d0e2b1..37e79d52c175 100644 int err; mv88e6xxx_reg_lock(chip); -@@ -3073,6 +3074,13 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, +@@ -3103,6 +3104,13 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, if (err) goto unlock; @@ -81,7 +81,7 @@ index 785cd3d0e2b1..37e79d52c175 100644 err = mv88e6xxx_port_set_map_da(chip, port, true); if (err) goto unlock; -@@ -3117,6 +3125,14 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port, +@@ -3147,6 +3155,14 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port, "port %d failed to restore map-DA: %pe\n", port, ERR_PTR(err)); @@ -96,7 +96,7 @@ index 785cd3d0e2b1..37e79d52c175 100644 err = mv88e6xxx_port_commit_pvid(chip, port); if (err) dev_err(ds->dev, -@@ -6992,30 +7008,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port, +@@ -7029,30 +7045,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack) { struct mv88e6xxx_chip *chip = ds->priv; @@ -128,7 +128,7 @@ index 785cd3d0e2b1..37e79d52c175 100644 mv88e6xxx_reg_unlock(chip); return err; } -@@ -7024,13 +7023,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port, +@@ -7061,13 +7060,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port, struct dsa_lag lag) { struct mv88e6xxx_chip *chip = ds->priv;