diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 13e5d69e..3fbbabe6 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.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" 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 1087e3a0..6292fdba 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.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" 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 8f7f8170..e700c703 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.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" 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 c8ff9653..89e55592 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.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" 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 91951163..0055aa0b 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.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.22" 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 96e3ae00..eea3fe3e 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 Linux kernel to 6.12.22 (LTS) - Format for disk image (for QEMU) has changed to `qcow2` ### Fixes diff --git a/patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.22/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 88% rename from patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.22/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index 94faf0bf..94f41400 100644 --- a/patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.22/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,4 +1,4 @@ -From 774cf1d3f5b9cfac247c3efcf4eed39d06c675dc Mon Sep 17 00:00:00 2001 +From 412fc6e03cfa025b34791b21a99d2a57a3e55d6b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 Subject: [PATCH 01/28] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for @@ -8,8 +8,6 @@ Organization: Wires In a multi-chip setup, delays of up to 750ms are observed before the device (6393X) signals completion of PPU initialization (Global 1, register 0, bit 15). Therefore, increase the timeout threshold to 1s. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -27,6 +25,3 @@ index 5aeecfab9630..2565277582c5 100644 u16 data; int err; int i; --- -2.43.0 - diff --git a/patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.22/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 98% rename from patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.22/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index d9fafed7..cbe8ae5e 100644 --- a/patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.22/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,4 +1,4 @@ -From 6bd6c3c49c438e35d61669879b64b6c4a00d1a19 Mon Sep 17 00:00:00 2001 +From 64426e005ad2ee6485c5ddf5421279278f48862b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 Subject: [PATCH 02/28] net: dsa: mv88e6xxx: Improve indirect register access @@ -13,8 +13,6 @@ previous families). Therefore, add a new set of SMI operations which remaps accesses to such registers to the corresponding directly addressable register. All other accesses use the regular indirect interface. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 7 +++ drivers/net/dsa/mv88e6xxx/global1.h | 3 ++ @@ -211,6 +209,3 @@ index c6c71d5757f5..788cf68b7b33 100644 int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip, struct mii_bus *bus, int sw_addr); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.22/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 90% rename from patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.22/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index 630630ef..1b11d14a 100644 --- a/patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.22/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,4 +1,4 @@ -From 02bb753cee9b24a3a1bcbcd15c3729144200eafc Mon Sep 17 00:00:00 2001 +From e37a0269c5ec92d9caa2d0bc40ddd2e306b3b3b2 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 Subject: [PATCH 03/28] net: dsa: mv88e6xxx: Honor ports being managed via @@ -13,8 +13,6 @@ USXGMII autoneg) This state is the default set up by mv88e6xxx_port_setup_mac(), so all we have to do is to make the phylink MAC callbacks no-ops in cases when in-band-status is being used. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) @@ -43,6 +41,3 @@ index 7ba492ee5c86..cdf48fae0623 100644 ops = chip->info->ops; mv88e6xxx_reg_lock(chip); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.22/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 96% rename from patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.22/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index 72f2ae39..7e870580 100644 --- a/patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.22/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,4 +1,4 @@ -From 6cbb6a0a54d81ff5b117b023ac7e251ab1e9c556 Mon Sep 17 00:00:00 2001 +From 81a1058bbda1b01139880142920e3345869994c8 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 Subject: [PATCH 04/28] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user @@ -29,8 +29,6 @@ Before this change, due to rsvd2cpu being enabled on the CPU port, the switch would try to trap it back to the CPU. Given that the CPU is trusted, instead assume that it indeed meant for the packet to be forwarded like any other. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) @@ -98,6 +96,3 @@ index 04053fdc6489..f25fb3214acb 100644 if (err) return err; --- -2.43.0 - diff --git a/patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.22/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 98% rename from patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.22/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index 33374568..e3327e7f 100644 --- a/patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.22/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,4 +1,4 @@ -From 86b1608084c6e9676db0641f31203d8067893470 Mon Sep 17 00:00:00 2001 +From cb2d53a6cbbdd86fabaa19bf1596bf707e22648b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 Subject: [PATCH 05/28] net: dsa: mv88e6xxx: Add LED infrastructure @@ -6,8 +6,6 @@ Organization: Wires Parse DT for LEDs and register them for devices that support it, though no actual implementations exist yet. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/Makefile | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 5 +- @@ -311,6 +309,3 @@ index 000000000000..8afa2a0c0527 +int mv88e6xxx_port_setup_leds(struct dsa_switch *ds, int port); + +#endif /* _MV88E6XXX_LEDS_H */ --- -2.43.0 - diff --git a/patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.22/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 98% rename from patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.22/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 4216b47d..77debd4a 100644 --- a/patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.22/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,4 +1,4 @@ -From 5496a27ee644f72b721eba0e8c057efb65ee445f Mon Sep 17 00:00:00 2001 +From fcd9b8f9d6b91eab102dfa97ab7488abd1fbb9e4 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 Subject: [PATCH 06/28] net: dsa: mv88e6xxx: Add LED support for 6393X @@ -8,8 +8,6 @@ Trigger support: - "none" - "timer" - "netdev" - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + drivers/net/dsa/mv88e6xxx/leds.c | 229 +++++++++++++++++++++++++++++++ @@ -359,6 +357,3 @@ index ddadeb9bfdae..7157864dc20f 100644 int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip, enum mv88e6xxx_egress_direction direction, int port); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.22/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 91% rename from patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.22/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index e685db02..5398aed8 100644 --- a/patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.22/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,4 +1,4 @@ -From a0e2ebe61422d5e0e330022a2a38a31c049a4407 Mon Sep 17 00:00:00 2001 +From a7f85153c0aa99c567c62a14f8c29eb3577265d9 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 Subject: [PATCH 07/28] net: dsa: tag_dsa: Use tag priority as initial @@ -19,8 +19,6 @@ Ideally we could then map this priority to an internal one, like we can do with an "ingress-qos-map" on VLAN interfaces. Until that is implemented, support the setup that is likely to be the most common; a 1:1 mapping from FPri to skb->priority. - -Signed-off-by: Tobias Waldekranz --- net/dsa/tag_dsa.c | 7 +++++++ 1 file changed, 7 insertions(+) @@ -43,6 +41,3 @@ index 2a2c4fb61a65..a00ae6bf2971 100644 return skb; } --- -2.43.0 - diff --git a/patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.22/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 95% rename from patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.22/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index b3f85d53..8d31df44 100644 --- a/patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.22/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,4 +1,4 @@ -From a88679c946d5163eb0e30718109c18ddbbd8cfc6 Mon Sep 17 00:00:00 2001 +From 8325784bddadb53ea2601858012be7097fa13c94 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 Subject: [PATCH 08/28] net: dsa: Support MDB memberships whose L2 addresses @@ -29,8 +29,6 @@ as long as the count is positive. Fortunately, all the infrastructure needed to do this is already in place, since it is also needed on CPU and DSA ports. Thus, "implement" this by simply removing the guards which previously skipped reference countung on user ports. - -Signed-off-by: Tobias Waldekranz --- net/dsa/switch.c | 16 ---------------- 1 file changed, 16 deletions(-) @@ -69,6 +67,3 @@ index 3d2feeea897b..628e8a884dde 100644 mutex_lock(&dp->addr_lists_lock); a = dsa_mac_addr_find(&dp->mdbs, mdb->addr, mdb->vid, db); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.22/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 95% rename from patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.22/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index c2a71548..1e458771 100644 --- a/patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.22/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,10 +1,9 @@ -From c6528f18fbafef721c18e546aa0b60c1b1d772c6 Mon Sep 17 00:00:00 2001 +From d9b49e23c7848972227ffc6f079d8c62d2a03c2e Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 Subject: [PATCH 09/28] net: dsa: Support EtherType based priority overrides Organization: Wires -Signed-off-by: Tobias Waldekranz --- include/net/dsa.h | 4 ++++ net/dsa/user.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- @@ -113,6 +112,3 @@ index 64f660d2334b..e13fb22e2c2b 100644 } break; case IEEE_8021QAZ_APP_SEL_DSCP: --- -2.43.0 - diff --git a/patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.22/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 98% rename from patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.22/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index bd70ef4d..f5015825 100644 --- a/patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.22/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,11 +1,10 @@ -From bc41b93b365694ac36a19565270b8deda3b8cb79 Mon Sep 17 00:00:00 2001 +From e77eb9a0196bad9f683411a0985821ab078da741 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 Subject: [PATCH 10/28] net: dsa: mv88e6xxx: Support EtherType based priority overrides Organization: Wires -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 64 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 21 ++++++++++ @@ -371,6 +370,3 @@ index 7157864dc20f..7edb04c41ac8 100644 int mv88e6xxx_port_set_message_port(struct mv88e6xxx_chip *chip, int port, bool message_port); int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port, --- -2.43.0 - diff --git a/patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.22/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 97% rename from patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.22/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index 6d342a10..4a82a2a2 100644 --- a/patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.22/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,4 +1,4 @@ -From 70c1d59448db0ec88c07fa4ff5748b0df740a8d2 Mon Sep 17 00:00:00 2001 +From 3fce5d8eb2b75aa4e549c798c703b99a5c895517 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 Subject: [PATCH 11/28] net: dsa: mv88e6xxx: Add mqprio qdisc support @@ -24,8 +24,6 @@ are effectively only specifying the QPri. Since FPri is always a 3-bit field, even on older chips with only 4 physical queues, always report 8 queues and let the chip's policy handle the mapping down to the "real" number. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++ net/dsa/tag_dsa.c | 4 +- @@ -157,6 +155,3 @@ index a00ae6bf2971..55c296e0b5b0 100644 dsa_header[3] = vid & 0xff; } --- -2.43.0 - diff --git a/patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.22/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 95% rename from patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.22/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index fab28205..40a3c129 100644 --- a/patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.22/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,4 +1,4 @@ -From c3721cb1cccf3c8fe18bea05c9ad20e7082291bd Mon Sep 17 00:00:00 2001 +From 314fb04205646cf25cdcbd8bcd760e554b7dfe79 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 Subject: [PATCH 12/28] net: dsa: mv88e6xxx: Use VLAN prio over IP when both @@ -22,8 +22,6 @@ main reasons for choosing the new default: packet's priority. As the packet then moves through the network core over trusted VLAN trunks, the packet should keep its original priority, independent of what inner protocol fields may indicate. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) @@ -57,6 +55,3 @@ index ad997818047e..40e8d2018fee 100644 MV88E6XXX_PORT_CTL0_STATE_FORWARDING; /* Forward any IPv4 IGMP or IPv6 MLD frames received * by a USER port to the CPU port to allow snooping. --- -2.43.0 - diff --git a/patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.22/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 97% rename from patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.22/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index a5579ca0..f5252737 100644 --- a/patches/linux/6.12.21/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.22/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,4 +1,4 @@ -From 373d60426de6d19fd668e1e0b599ca430f351a18 Mon Sep 17 00:00:00 2001 +From 696d559dd9874e8a481b66e24d85813d4f72b05f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 Subject: [PATCH 13/28] [FIX] net: dsa: mv88e6xxx: Trap locally terminated @@ -24,8 +24,6 @@ a VLAN upper interface, rather than to offload bridge VLANs, are marked as policy entries. As the VTU policy of user ports is already set to TRAP (to ensure proper standalone port operation), this will cause all packets assigned to these VLANs to properly terminated. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 33 ++++++++++++++++++-------------- include/net/switchdev.h | 4 ++++ @@ -156,6 +154,3 @@ index e13fb22e2c2b..f45e313f1dd0 100644 }; struct dsa_switch *ds = dp->ds; struct netdev_hw_addr *ha; --- -2.43.0 - diff --git a/patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.22/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 97% rename from patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.22/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index 3260e877..d7386a78 100644 --- a/patches/linux/6.12.21/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.22/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,4 +1,4 @@ -From a6368c60ac6ae2e0d97ac571b6506aa09becbb71 Mon Sep 17 00:00:00 2001 +From 898de5125467a650acf7da4cd938cbd0ac1c1be1 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 Subject: [PATCH 14/28] net: phy: marvell10g: Support firmware loading on @@ -11,8 +11,6 @@ its RAM, ask userspace for the binary and load it over XMDIO. We have no choice but to bail out of the probe if firmware is not available, as the device does not have any built-in image on which to fall back. - -Signed-off-by: Tobias Waldekranz --- drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) @@ -236,6 +234,3 @@ index 6642eb642d4b..79d9483419c0 100644 MODULE_DESCRIPTION("Marvell Alaska X/M multi-gigabit Ethernet PHY driver"); +MODULE_FIRMWARE("mrvl/x3310fw.hdr"); MODULE_LICENSE("GPL"); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.22/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 92% rename from patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.22/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index bfea152b..c5085734 100644 --- a/patches/linux/6.12.21/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.22/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,4 +1,4 @@ -From 550dd1b443cf9d054f2a523088fbe22b215e07cb Mon Sep 17 00:00:00 2001 +From ca661bdd22cca40a21161fe202cfac74dddaaf45 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 Subject: [PATCH 15/28] net: phy: marvell10g: Fix power-up when strapped to @@ -8,8 +8,6 @@ Organization: Wires On devices which are hardware strapped to start powered down (PDSTATE == 1), make sure that we clear the power-down bit on all units affected by this setting. - -Signed-off-by: Tobias Waldekranz --- drivers/net/phy/marvell10g.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) @@ -45,6 +43,3 @@ index 79d9483419c0..268484092776 100644 /* Sometimes, the power down bit doesn't clear immediately, and * a read of this register causes the bit not to clear. Delay --- -2.43.0 - diff --git a/patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.22/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 99% rename from patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.22/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index cdc55e40..e8092fed 100644 --- a/patches/linux/6.12.21/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.22/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,4 +1,4 @@ -From 9ca4c28ccf7857a36db8dd3c37dcd005222bdb78 Mon Sep 17 00:00:00 2001 +From 7884dc7b9dbd40165a34da8cdd4f7ebfdcfcfd86 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 Subject: [PATCH 16/28] net: phy: marvell10g: Add LED support for 88X3310 @@ -17,8 +17,6 @@ Trigger support: software blinking - "netdev": Offload link or duplex information to the solid behavior; tx and/or rx activity to blink behavior. - -Signed-off-by: Tobias Waldekranz --- drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++ 1 file changed, 422 insertions(+) @@ -512,6 +510,3 @@ index 268484092776..9f8475b67ef7 100644 }, { .phy_id = MARVELL_PHY_ID_88X3310, --- -2.43.0 - diff --git a/patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.22/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 94% rename from patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.22/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index a0eaebf8..f8b484f0 100644 --- a/patches/linux/6.12.21/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.22/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,4 +1,4 @@ -From 69f9bda6cab34556e67a096c282eee7337f97f26 Mon Sep 17 00:00:00 2001 +From c93ff33ba09c6af6a20f62e07590c01bc9252b78 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 Subject: [PATCH 17/28] net: phy: marvell10g: Support LEDs tied to a single @@ -14,8 +14,6 @@ tied to a particular media side, and use that information to refine the offloading of the "netdev" trigger, such that LEDs attached to the RJ45 jack only lights up when a copper link is established, and vice versa for the SFP cage. - -Signed-off-by: Tobias Waldekranz --- drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) @@ -75,6 +73,3 @@ index 9f8475b67ef7..82b2e9b55b67 100644 /* mv3310_led_polarity_set() will not be called unless the * device tree specifies a mode that of_phy_led() considers to * be a non-default configuration. I.e., something other than --- -2.43.0 - diff --git a/patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.22/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 89% rename from patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.22/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index 5f6f24d7..9d9198ba 100644 --- a/patches/linux/6.12.21/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.22/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,4 +1,4 @@ -From f70be42f0ee50cda8c1cde14442ea8285c01834b Mon Sep 17 00:00:00 2001 +From a4d0d5bff004b329cd83fa0806d52a6eb1977b55 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 Subject: [PATCH 18/28] net: phy: Do not resume PHY when attaching @@ -15,8 +15,6 @@ Otherwise, drivers that attached to their PHYs during probing (e.g. DSA) would end up with a physical link being established, even though the corresponding interface was still administratively down. - -Signed-off-by: Tobias Waldekranz --- drivers/net/phy/phy_device.c | 1 - 1 file changed, 1 deletion(-) @@ -33,6 +31,3 @@ index 119dfa2d6643..7c7cc6edf314 100644 if (!phydev->is_on_sfp_module) phy_led_triggers_register(phydev); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.22/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 98% rename from patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.22/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index 0c1cf6f6..e41e35c4 100644 --- a/patches/linux/6.12.21/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.22/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,4 +1,4 @@ -From 17d6f3f6a7429ae635d0359b39da2e173c403fdf Mon Sep 17 00:00:00 2001 +From 4a519b0c0f6b213373756c81766f0d2564b782e7 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 Subject: [PATCH 19/28] net: bridge: avoid classifying unknown multicast as @@ -16,7 +16,6 @@ Because a multicast router should always receive both known and unknown multicast. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz --- include/uapi/linux/if_bridge.h | 1 + net/bridge/br.c | 5 +++++ @@ -232,6 +231,3 @@ index 041f6e571a20..40651b07df94 100644 static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx, struct sk_buff *skb) { --- -2.43.0 - diff --git a/patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.22/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 94% rename from patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.22/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 52d25922..3b31eaf6 100644 --- a/patches/linux/6.12.21/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.22/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,4 +1,4 @@ -From 27ca82c96a6bcd560e908eed17fc24126e8051a6 Mon Sep 17 00:00:00 2001 +From f759e64aea4262f0744a3b8b7dee9c70bb3839c4 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 Subject: [PATCH 20/28] net: bridge: Ignore router ports when forwarding L2 @@ -32,6 +32,3 @@ index 40651b07df94..e90b4f5cab76 100644 } static inline struct net_bridge_port * --- -2.43.0 - diff --git a/patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.22/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 97% rename from patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.22/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 0659d740..bb035996 100644 --- a/patches/linux/6.12.21/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.22/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,4 +1,4 @@ -From bbbb4f7460efeaf057d37d837cae79a565a6d406 Mon Sep 17 00:00:00 2001 +From eef84ce9cb63463b59239eb0cd352bc829b99605 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 Subject: [PATCH 21/28] net: bridge: drop delay for applying strict multicast @@ -19,7 +19,6 @@ A proper fix for upstreaming could be to add a knob to disable the delay. [2]: https://lore.kernel.org/netdev/20240127175033.9640-1-linus.luessing@c0d3.blue/ Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz --- net/bridge/br_multicast.c | 42 +++++++-------------------------------- net/bridge/br_private.h | 4 +--- @@ -186,6 +185,3 @@ index e90b4f5cab76..73b78c594564 100644 } static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx, --- -2.43.0 - diff --git a/patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.22/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 96% rename from patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.22/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index 2891a1f8..2bddf6da 100644 --- a/patches/linux/6.12.21/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.22/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,4 +1,4 @@ -From 7c751c24428060c3e87f164eb2a054db410f4b0d Mon Sep 17 00:00:00 2001 +From b6d5faea067b67dae8983ca116112a2b86cd0e9b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 Subject: [PATCH 22/28] net: bridge: Differentiate MDB additions from @@ -21,8 +21,6 @@ generated. Therefore, discriminate new groups from changes to existing groups by introducing a RTM_SETMDB events to be used in the latter scenario. - -Signed-off-by: Tobias Waldekranz --- include/uapi/linux/rtnetlink.h | 2 ++ net/bridge/br_mdb.c | 4 ++-- @@ -104,6 +102,3 @@ index 34be07a1fd00..9c8bf38e0079 100644 unlock_continue: spin_unlock(&brmctx->br->multicast_lock); } --- -2.43.0 - diff --git a/patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.22/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 92% rename from patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.22/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index 65451094..d373c374 100644 --- a/patches/linux/6.12.21/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.22/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,4 +1,4 @@ -From db0d727f6cc90ccea2378d876329c151db1670dc Mon Sep 17 00:00:00 2001 +From 094213f7f29c8a39e4a4524b67e3e40c338b5a7b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 Subject: [PATCH 23/28] nvmem: layouts: onie-tlv: Let device probe even when @@ -13,8 +13,6 @@ be successfully probed. Therefore, settle for reporting data corruption issues in the log, and simply refrain from registering any cells in those cases. - -Signed-off-by: Tobias Waldekranz --- drivers/nvmem/layouts/onie-tlv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -50,6 +48,3 @@ index 0967a32319a2..48547d5bb502 100644 data = table + hdr_len; ret = onie_tlv_add_cells(dev, nvmem, data_len, data); --- -2.43.0 - diff --git a/patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.22/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 93% rename from patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.22/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index 36caaea7..14585ae2 100644 --- a/patches/linux/6.12.21/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.22/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,4 +1,4 @@ -From ed58f4b6e7344bdefceb7ac31d1c769a6d127827 Mon Sep 17 00:00:00 2001 +From ca424b04e9a753cfeb3a92d080a595fc28498fac Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 Subject: [PATCH 24/28] usb: core: adjust log level for unauthorized devices @@ -9,7 +9,6 @@ so let's adjust the log level so these messages slip below radar for the commonly used 'quiet' log level. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz --- drivers/usb/core/driver.c | 4 ++-- drivers/usb/core/generic.c | 2 +- @@ -45,6 +44,3 @@ index b134bff5c3fe..60575a01a810 100644 else { c = usb_choose_configuration(udev); if (c >= 0) { --- -2.43.0 - diff --git a/patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.22/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 91% rename from patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.12.22/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index 1d983fce..6207950f 100644 --- a/patches/linux/6.12.21/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.12.22/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,4 +1,4 @@ -From e7f7ae788680b4ec73af736453ec4afeb34d9842 Mon Sep 17 00:00:00 2001 +From 569890f4ecbbd756e1d018407e1d97d98117c460 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 Subject: [PATCH 25/28] net: dsa: mv88e6xxx: collapse disabled state into @@ -18,7 +18,6 @@ each member port, preventing LACPDUs from passing through to qualify the link and become active. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/port.c | 2 -- 1 file changed, 2 deletions(-) @@ -36,6 +35,3 @@ index 84900814c456..91e58297594c 100644 case BR_STATE_BLOCKING: case BR_STATE_LISTENING: state = MV88E6XXX_PORT_CTL0_STATE_BLOCKING; --- -2.43.0 - diff --git a/patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.22/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 97% rename from patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.12.22/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index 7b4ff41d..3f66c39d 100644 --- a/patches/linux/6.12.21/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.12.22/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,4 +1,4 @@ -From 823687aa03d866f3b76b5e40e35fa56c7f6f4492 Mon Sep 17 00:00:00 2001 +From 415473236cee34dc39da4ba25a1c1c006838164c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 Subject: [PATCH 26/28] net: dsa: mv88e6xxx: Only activate LAG offloading when @@ -46,8 +46,6 @@ existing port isolation to work as intended. Before joining a bridge, the offload does not offer any performance benefit anyway. All ingressing packet will always have to go to the CPU; egress traffic always relies on software hashing. - -Signed-off-by: Tobias Waldekranz --- drivers/net/dsa/mv88e6xxx/chip.c | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) @@ -142,6 +140,3 @@ index 30f8a5388733..c1f8adaa008a 100644 } static int mv88e6xxx_crosschip_lag_change(struct dsa_switch *ds, int sw_index, --- -2.43.0 - diff --git a/patches/linux/6.12.21/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch b/patches/linux/6.12.22/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch similarity index 99% rename from patches/linux/6.12.21/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch rename to patches/linux/6.12.22/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch index 06466608..e35bda78 100644 --- a/patches/linux/6.12.21/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch +++ b/patches/linux/6.12.22/0027-net-mvpp2-Prevent-parser-TCAM-memory-corruption.patch @@ -1,4 +1,4 @@ -From 444179c2b41b18c4e9e2300aa7ccd469be809b04 Mon Sep 17 00:00:00 2001 +From f6862a76eca677ba1ad2892e781204a463ea78ee Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 18 Mar 2025 10:55:09 +0100 Subject: [PATCH 27/28] net: mvpp2: Prevent parser TCAM memory corruption @@ -646,6 +646,3 @@ index 9af22f497a40..a96edc7dc0de 100644 + spin_unlock_bh(&priv->prs_spinlock); return val; } --- -2.43.0 - diff --git a/patches/linux/6.12.21/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.12.22/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch similarity index 94% rename from patches/linux/6.12.21/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch rename to patches/linux/6.12.22/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch index 4a780375..61782bec 100644 --- a/patches/linux/6.12.21/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch +++ b/patches/linux/6.12.22/0028-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch @@ -1,4 +1,4 @@ -From b68ebd1671df08870854a16b6661b29a4022df90 Mon Sep 17 00:00:00 2001 +From 8b8e0be081bb6a56f1697bc67af61f73753acd03 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 11 Aug 2024 11:27:35 +0200 Subject: [PATCH 28/28] net: usb: r8152: add r8153b support for link/activity @@ -44,6 +44,3 @@ index 468c73974046..7e4089f10fde 100644 rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ --- -2.43.0 - diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash index 6dcaaef7..df97ba41 100644 --- a/patches/linux/linux.hash +++ b/patches/linux/linux.hash @@ -1,3 +1,2 @@ -# Locally calculated -sha256 9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04 linux-6.8.2.tar.xz -sha256 fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698 linux-6.10.3.tar.xz +# Calculated with ../utils/kernel-refresh.sh +sha256 ab48800ab49985a78d2318ae8ac5f28fd3e123ea17357ef21498105a53337336 linux-6.12.22.tar.xz