From 2903f6f472ee34d10ec280f6f780027d443d369a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Thu, 23 Oct 2025 21:07:10 +0200 Subject: [PATCH] Upgrade Linux kernel to 6.12.55 (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 | 2 +- ...v88e6xxx-Fix-timeout-on-waiting-for-PPU.patch | 4 ++-- ...6xxx-Improve-indirect-register-access-p.patch | 12 ++++++------ ...6xxx-Honor-ports-being-managed-via-in-b.patch | 4 ++-- ...6xxx-Limit-rsvd2cpu-policy-to-user-port.patch | 4 ++-- ...et-dsa-mv88e6xxx-Add-LED-infrastructure.patch | 12 ++++++------ ...dsa-mv88e6xxx-Add-LED-support-for-6393X.patch | 12 ++++++------ ...sa-Use-tag-priority-as-initial-skb-prio.patch | 4 ++-- ...rt-MDB-memberships-whose-L2-addresses-o.patch | 4 ++-- ...port-EtherType-based-priority-overrides.patch | 6 +++--- ...6xxx-Support-EtherType-based-priority-o.patch | 14 +++++++------- ...-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch | 6 +++--- ...6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch | 4 ++-- ...mv88e6xxx-Trap-locally-terminated-VLANs.patch | 8 ++++---- ...ll10g-Support-firmware-loading-on-88X33.patch | 4 ++-- ...ll10g-Fix-power-up-when-strapped-to-sta.patch | 4 ++-- ...-marvell10g-Add-LED-support-for-88X3310.patch | 4 ++-- ...ll10g-Support-LEDs-tied-to-a-single-med.patch | 4 ++-- ...et-phy-Do-not-resume-PHY-when-attaching.patch | 4 ++-- ...oid-classifying-unknown-multicast-as-mr.patch | 16 ++++++++-------- ...nore-router-ports-when-forwarding-L2-mu.patch | 4 ++-- ...op-delay-for-applying-strict-multicast-.patch | 6 +++--- ...fferentiate-MDB-additions-from-modifica.patch | 8 ++++---- ...-onie-tlv-Let-device-probe-even-when-TL.patch | 4 ++-- ...just-log-level-for-unauthorized-devices.patch | 6 +++--- ...6xxx-collapse-disabled-state-into-block.patch | 4 ++-- ...6xxx-Only-activate-LAG-offloading-when-.patch | 4 ++-- ...-add-r8153b-support-for-link-activity-L.patch | 4 ++-- ...iatek-mt7986a-rename-BPi-R3-ports-to-ma.patch | 4 ++-- ...ple-Add-a-timing-for-the-Raspberry-Pi-7.patch | 4 ++-- ...-touchscreen-edt-ft5x06-Add-polled-mode.patch | 4 ++-- patches/linux/linux.hash | 2 +- 37 files changed, 98 insertions(+), 98 deletions(-) rename patches/linux/{6.12.54 => 6.12.55}/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch (90%) rename patches/linux/{6.12.54 => 6.12.55}/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch (96%) rename patches/linux/{6.12.54 => 6.12.55}/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch (92%) rename patches/linux/{6.12.54 => 6.12.55}/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch (96%) rename patches/linux/{6.12.54 => 6.12.55}/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch (96%) rename patches/linux/{6.12.54 => 6.12.55}/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch (93%) rename patches/linux/{6.12.54 => 6.12.55}/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch (95%) rename patches/linux/{6.12.54 => 6.12.55}/0009-net-dsa-Support-EtherType-based-priority-overrides.patch (95%) rename patches/linux/{6.12.54 => 6.12.55}/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch (95%) rename patches/linux/{6.12.54 => 6.12.55}/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch (96%) rename patches/linux/{6.12.54 => 6.12.55}/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch (98%) rename patches/linux/{6.12.54 => 6.12.55}/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch (93%) rename patches/linux/{6.12.54 => 6.12.55}/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch (99%) rename patches/linux/{6.12.54 => 6.12.55}/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch (95%) rename patches/linux/{6.12.54 => 6.12.55}/0018-net-phy-Do-not-resume-PHY-when-attaching.patch (91%) rename patches/linux/{6.12.54 => 6.12.55}/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch (95%) rename patches/linux/{6.12.54 => 6.12.55}/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch (92%) rename patches/linux/{6.12.54 => 6.12.55}/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch (94%) rename patches/linux/{6.12.54 => 6.12.55}/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch (94%) rename patches/linux/{6.12.54 => 6.12.55}/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch (91%) rename patches/linux/{6.12.54 => 6.12.55}/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch (93%) rename patches/linux/{6.12.54 => 6.12.55}/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch (92%) rename patches/linux/{6.12.54 => 6.12.55}/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch (93%) rename patches/linux/{6.12.54 => 6.12.55}/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch (97%) rename patches/linux/{6.12.54 => 6.12.55}/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch (97%) diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index e5a08fcd..9a903f38 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -28,7 +28,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.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" 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 973e8f9f..a1940ac1 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.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" 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 d0c2d5c7..9998796a 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.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" 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 7b4b1a32..616760ea 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_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.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" 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 c5641534..fdcba01c 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.54" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55" 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 48e87457..743d909c 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -9,7 +9,7 @@ All notable changes to the project are documented in this file. ### Changes - Upgrade Buildroot to 2025.02.7 (LTS) -- Upgrade Linux kernel to 6.12.54 (LTS) +- Upgrade Linux kernel to 6.12.55 (LTS) - Extend NETCONF and RESTCONF scripting documentation with operational data examples, discovery patterns, and common workflow examples, issue #1156 - Initial support for a zone-based firewall, based on `firewalld`, issue #448 diff --git a/patches/linux/6.12.54/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.55/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 90% rename from patches/linux/6.12.54/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.55/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index bc08fe00..abb7719d 100644 --- a/patches/linux/6.12.54/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.55/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,4 +1,4 @@ -From 038580d5a1629ee6b87a4fce58b57f16c003063e Mon Sep 17 00:00:00 2001 +From 98b8e71b03266a3e17b00562eea1a0e5951b0843 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 Subject: [PATCH 01/30] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for @@ -13,7 +13,7 @@ register 0, bit 15). Therefore, increase the timeout threshold to 1s. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 211c219dd52db..d64c3eef4447a 100644 +index 211c219dd52d..d64c3eef4447 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.54/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.55/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 96% rename from patches/linux/6.12.54/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.55/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index df912045..dec1e174 100644 --- a/patches/linux/6.12.54/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.55/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,4 +1,4 @@ -From 9b9c52ca8b20f3ff114217f1ef3399730e079568 Mon Sep 17 00:00:00 2001 +From d898868df98ef351f0dcc98f4069f333e89bc862 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 Subject: [PATCH 02/30] net: dsa: mv88e6xxx: Improve indirect register access @@ -22,7 +22,7 @@ other accesses use the regular indirect interface. 5 files changed, 119 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index d64c3eef4447a..47138492885e6 100644 +index d64c3eef4447..47138492885e 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6539,6 +6539,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip) @@ -40,7 +40,7 @@ index d64c3eef4447a..47138492885e6 100644 chip->info->prod_num, chip->info->name, rev); diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h -index 3dbb7a1b8fe11..5ea956aadecc9 100644 +index 3dbb7a1b8fe1..5ea956aadecc 100644 --- a/drivers/net/dsa/mv88e6xxx/global1.h +++ b/drivers/net/dsa/mv88e6xxx/global1.h @@ -218,6 +218,9 @@ @@ -54,7 +54,7 @@ index 3dbb7a1b8fe11..5ea956aadecc9 100644 #define MV88E6XXX_G1_CTL2 0x1c #define MV88E6185_G1_CTL2_CASCADE_PORT_MASK 0xf000 diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h -index 82f9b410de0b8..3663645621c9d 100644 +index 82f9b410de0b..3663645621c9 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.h +++ b/drivers/net/dsa/mv88e6xxx/global2.h @@ -143,6 +143,9 @@ @@ -68,7 +68,7 @@ index 82f9b410de0b8..3663645621c9d 100644 #define MV88E6XXX_G2_EEPROM_CMD 0x14 #define MV88E6XXX_G2_EEPROM_CMD_BUSY 0x8000 diff --git a/drivers/net/dsa/mv88e6xxx/smi.c b/drivers/net/dsa/mv88e6xxx/smi.c -index a990271b74823..f54bb0e79030c 100644 +index a990271b7482..f54bb0e79030 100644 --- a/drivers/net/dsa/mv88e6xxx/smi.c +++ b/drivers/net/dsa/mv88e6xxx/smi.c @@ -8,6 +8,8 @@ @@ -169,7 +169,7 @@ index a990271b74823..f54bb0e79030c 100644 chip->smi_ops = &mv88e6xxx_smi_indirect_ops; else diff --git a/drivers/net/dsa/mv88e6xxx/smi.h b/drivers/net/dsa/mv88e6xxx/smi.h -index c6c71d5757f5d..788cf68b7b334 100644 +index c6c71d5757f5..788cf68b7b33 100644 --- a/drivers/net/dsa/mv88e6xxx/smi.h +++ b/drivers/net/dsa/mv88e6xxx/smi.h @@ -31,6 +31,36 @@ diff --git a/patches/linux/6.12.54/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.55/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 92% rename from patches/linux/6.12.54/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.55/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index e2fa1877..3433dafc 100644 --- a/patches/linux/6.12.54/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.55/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,4 +1,4 @@ -From 0dff719628a25882eae67030643ba2c674460d04 Mon Sep 17 00:00:00 2001 +From b7774886dbfa5e888e482149430e0cebf485558a Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 Subject: [PATCH 03/30] net: dsa: mv88e6xxx: Honor ports being managed via @@ -18,7 +18,7 @@ when in-band-status is being used. 1 file changed, 6 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 47138492885e6..b96bc12dc6a86 100644 +index 47138492885e..b96bc12dc6a8 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.54/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.55/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 96% rename from patches/linux/6.12.54/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.55/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index 18a95cfd..9f8bbb56 100644 --- a/patches/linux/6.12.54/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.55/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,4 +1,4 @@ -From ea15c57ab036135e2168e49796c355c9c64bb205 Mon Sep 17 00:00:00 2001 +From 97e3384bea3c0cc553c6158c35759e3cc60b9f70 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 Subject: [PATCH 04/30] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user @@ -34,7 +34,7 @@ forwarded like any other. 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c -index 04053fdc6489a..f25fb3214acb9 100644 +index 04053fdc6489..f25fb3214acb 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -1432,6 +1432,23 @@ static int mv88e6393x_port_policy_write_all(struct mv88e6xxx_chip *chip, diff --git a/patches/linux/6.12.54/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.55/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 96% rename from patches/linux/6.12.54/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.55/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index d88d7db7..f6cc64b6 100644 --- a/patches/linux/6.12.54/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.55/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,4 +1,4 @@ -From 09d9548a1636008ece7d5f32d9a8d8a6e3c10047 Mon Sep 17 00:00:00 2001 +From 87d133136a92bd905373ad4ea5be943dc3fa423e Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 Subject: [PATCH 05/30] net: dsa: mv88e6xxx: Add LED infrastructure @@ -17,7 +17,7 @@ though no actual implementations exist yet. create mode 100644 drivers/net/dsa/mv88e6xxx/leds.h diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile -index a9a9651187db7..6720d93039148 100644 +index a9a9651187db..6720d9303914 100644 --- a/drivers/net/dsa/mv88e6xxx/Makefile +++ b/drivers/net/dsa/mv88e6xxx/Makefile @@ -9,6 +9,7 @@ mv88e6xxx-objs += global2.o @@ -29,7 +29,7 @@ index a9a9651187db7..6720d93039148 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 b96bc12dc6a86..f92b7d7d57801 100644 +index b96bc12dc6a8..f92b7d7d5780 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -37,6 +37,7 @@ @@ -52,7 +52,7 @@ index b96bc12dc6a86..f92b7d7d57801 100644 static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port) diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h -index a546822408396..32c87ab754d1f 100644 +index a54682240839..32c87ab754d1 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -207,6 +207,7 @@ struct mv88e6xxx_avb_ops; @@ -102,7 +102,7 @@ index a546822408396..32c87ab754d1f 100644 static inline bool mv88e6xxx_has_stu(struct mv88e6xxx_chip *chip) diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c new file mode 100644 -index 0000000000000..e3de10991f297 +index 000000000000..e3de10991f29 --- /dev/null +++ b/drivers/net/dsa/mv88e6xxx/leds.c @@ -0,0 +1,185 @@ @@ -293,7 +293,7 @@ index 0000000000000..e3de10991f297 +} diff --git a/drivers/net/dsa/mv88e6xxx/leds.h b/drivers/net/dsa/mv88e6xxx/leds.h new file mode 100644 -index 0000000000000..8afa2a0c05278 +index 000000000000..8afa2a0c0527 --- /dev/null +++ b/drivers/net/dsa/mv88e6xxx/leds.h @@ -0,0 +1,12 @@ diff --git a/patches/linux/6.12.54/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.55/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 97% rename from patches/linux/6.12.54/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.55/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 82f39d36..01163863 100644 --- a/patches/linux/6.12.54/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.55/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,4 +1,4 @@ -From c282aee3511fb5e515e25021f83cf34af5fc1045 Mon Sep 17 00:00:00 2001 +From 16af56495fc5a5fad53d1bd53dc47f64a0eafb9e Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 Subject: [PATCH 06/30] net: dsa: mv88e6xxx: Add LED support for 6393X @@ -17,7 +17,7 @@ Trigger support: 5 files changed, 272 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index f92b7d7d57801..c833b7e44d8b4 100644 +index f92b7d7d5780..c833b7e44d8b 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5691,6 +5691,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { @@ -29,7 +29,7 @@ index f92b7d7d57801..c833b7e44d8b4 100644 .pcs_ops = &mv88e6393x_pcs_ops, }; diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c -index e3de10991f297..acdb5eca66472 100644 +index e3de10991f29..acdb5eca6647 100644 --- a/drivers/net/dsa/mv88e6xxx/leds.c +++ b/drivers/net/dsa/mv88e6xxx/leds.c @@ -5,6 +5,13 @@ @@ -276,7 +276,7 @@ index e3de10991f297..acdb5eca66472 100644 enum led_brightness brightness) { diff --git a/drivers/net/dsa/mv88e6xxx/leds.h b/drivers/net/dsa/mv88e6xxx/leds.h -index 8afa2a0c05278..542345d23dc5a 100644 +index 8afa2a0c0527..542345d23dc5 100644 --- a/drivers/net/dsa/mv88e6xxx/leds.h +++ b/drivers/net/dsa/mv88e6xxx/leds.h @@ -7,6 +7,8 @@ @@ -289,7 +289,7 @@ index 8afa2a0c05278..542345d23dc5a 100644 #endif /* _MV88E6XXX_LEDS_H */ diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c -index f25fb3214acb9..aa5d312d8aa5e 100644 +index f25fb3214acb..aa5d312d8aa5 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -1558,6 +1558,39 @@ int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port, @@ -333,7 +333,7 @@ index f25fb3214acb9..aa5d312d8aa5e 100644 * Offset 0x19: Port IEEE Priority Remapping Registers [4-7] */ diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h -index ddadeb9bfdaee..7157864dc20fe 100644 +index ddadeb9bfdae..7157864dc20f 100644 --- a/drivers/net/dsa/mv88e6xxx/port.h +++ b/drivers/net/dsa/mv88e6xxx/port.h @@ -309,6 +309,9 @@ diff --git a/patches/linux/6.12.54/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.55/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 93% rename from patches/linux/6.12.54/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.55/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 6b5b0974..94f8c79c 100644 --- a/patches/linux/6.12.54/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.55/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,4 +1,4 @@ -From 568b7e43df5720bc0bc52987584a02ed2594afce Mon Sep 17 00:00:00 2001 +From 32f05a6f4f0b5adc000df21d5422ef52f3dbb00b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 Subject: [PATCH 07/30] net: dsa: tag_dsa: Use tag priority as initial @@ -24,7 +24,7 @@ implemented, support the setup that is likely to be the most common; a 1 file changed, 7 insertions(+) diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c -index 2a2c4fb61a65c..a00ae6bf29717 100644 +index 2a2c4fb61a65..a00ae6bf2971 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -323,6 +323,13 @@ static struct sk_buff *dsa_rcv_ll(struct sk_buff *skb, struct net_device *dev, diff --git a/patches/linux/6.12.54/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.55/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 95% rename from patches/linux/6.12.54/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.55/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index cc157d02..27f3a87e 100644 --- a/patches/linux/6.12.54/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.55/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,4 +1,4 @@ -From 60c136d299445a9eeb9464689f24fe3b0c943802 Mon Sep 17 00:00:00 2001 +From d02630630280135612398574bcf3683c26a1bef0 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 Subject: [PATCH 08/30] net: dsa: Support MDB memberships whose L2 addresses @@ -34,7 +34,7 @@ which previously skipped reference countung on user ports. 1 file changed, 16 deletions(-) diff --git a/net/dsa/switch.c b/net/dsa/switch.c -index 3d2feeea897b6..628e8a884dde5 100644 +index 3d2feeea897b..628e8a884dde 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -164,14 +164,6 @@ static int dsa_port_do_mdb_add(struct dsa_port *dp, diff --git a/patches/linux/6.12.54/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.55/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 95% rename from patches/linux/6.12.54/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.55/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index 4609b574..68139af6 100644 --- a/patches/linux/6.12.54/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.55/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,4 +1,4 @@ -From d78d4f058f19e746d60e2b839e5624a429920b41 Mon Sep 17 00:00:00 2001 +From 1bd83dde6e63043fba885cec72190f4d8bb57b26 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 Subject: [PATCH 09/30] net: dsa: Support EtherType based priority overrides @@ -10,7 +10,7 @@ Organization: Wires 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h -index 877f9b270cf6f..d86698e0e12c5 100644 +index 877f9b270cf6..d86698e0e12c 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -968,6 +968,10 @@ struct dsa_switch_ops { @@ -25,7 +25,7 @@ index 877f9b270cf6f..d86698e0e12c5 100644 /* * Suspend and resume diff --git a/net/dsa/user.c b/net/dsa/user.c -index 06267c526dc4e..ee0e5cf3f6d8e 100644 +index 06267c526dc4..ee0e5cf3f6d8 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -2302,6 +2302,34 @@ dsa_user_dcbnl_add_dscp_prio(struct net_device *dev, struct dcb_app *app) diff --git a/patches/linux/6.12.54/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.55/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 97% rename from patches/linux/6.12.54/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.55/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index f6ba2750..4fca0a86 100644 --- a/patches/linux/6.12.54/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.55/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,4 +1,4 @@ -From 2badb072bc4d1aaa64f7afad989aadb9bb15c0f9 Mon Sep 17 00:00:00 2001 +From 12384805155768d17b6564c3905fb8692e16faf5 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 Subject: [PATCH 10/30] net: dsa: mv88e6xxx: Support EtherType based priority @@ -15,7 +15,7 @@ Organization: Wires 6 files changed, 207 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index c833b7e44d8b4..c483696634256 100644 +index c833b7e44d8b..c48369663425 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) @@ -118,7 +118,7 @@ index c833b7e44d8b4..c483696634256 100644 static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h -index 32c87ab754d1f..25edc25349790 100644 +index 32c87ab754d1..25edc2534979 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -293,6 +293,11 @@ struct mv88e6xxx_port { @@ -171,7 +171,7 @@ index 32c87ab754d1f..25edc25349790 100644 struct mv88e6xxx_bus_ops { diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c -index b2b5f6ba438f4..2c52903e8992b 100644 +index b2b5f6ba438f..2c52903e8992 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -315,7 +315,7 @@ int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats) @@ -245,7 +245,7 @@ index b2b5f6ba438f4..2c52903e8992b 100644 * Offset 0x15: EEPROM Data (for 16-bit data access) * Offset 0x15: EEPROM Addr (for 8-bit data access) diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h -index 3663645621c9d..496269c26c508 100644 +index 3663645621c9..496269c26c50 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.h +++ b/drivers/net/dsa/mv88e6xxx/global2.h @@ -138,6 +138,7 @@ @@ -267,7 +267,7 @@ index 3663645621c9d..496269c26c508 100644 int mv88e6xxx_g2_trunk_mask_write(struct mv88e6xxx_chip *chip, int num, bool hash, u16 mask); diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c -index aa5d312d8aa5e..84900814c4562 100644 +index aa5d312d8aa5..84900814c456 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -1558,6 +1558,52 @@ int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port, @@ -324,7 +324,7 @@ index aa5d312d8aa5e..84900814c4562 100644 int mv88e6393x_port_led_write(struct mv88e6xxx_chip *chip, int port, diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h -index 7157864dc20fe..7edb04c41ac85 100644 +index 7157864dc20f..7edb04c41ac8 100644 --- a/drivers/net/dsa/mv88e6xxx/port.h +++ b/drivers/net/dsa/mv88e6xxx/port.h @@ -286,7 +286,18 @@ diff --git a/patches/linux/6.12.54/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.55/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 97% rename from patches/linux/6.12.54/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.55/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index cfdffdbe..151471ce 100644 --- a/patches/linux/6.12.54/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.55/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,4 +1,4 @@ -From b33d0a95084d0ec13aac1c831ba06ab91f2796d5 Mon Sep 17 00:00:00 2001 +From f3c14dfa8d1251bbf83b946c44d4faa176a78170 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 Subject: [PATCH 11/30] net: dsa: mv88e6xxx: Add mqprio qdisc support @@ -30,7 +30,7 @@ handle the mapping down to the "real" number. 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index c483696634256..050a89c1b7e13 100644 +index c48369663425..050a89c1b7e1 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -31,6 +31,7 @@ @@ -132,7 +132,7 @@ index c483696634256..050a89c1b7e13 100644 return dsa_register_switch(ds); diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c -index a00ae6bf29717..55c296e0b5b0e 100644 +index a00ae6bf2971..55c296e0b5b0 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -180,8 +180,10 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, diff --git a/patches/linux/6.12.54/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.55/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 95% rename from patches/linux/6.12.54/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.55/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index 68ae64f8..0ef50c7f 100644 --- a/patches/linux/6.12.54/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.55/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,4 +1,4 @@ -From 4be1893895376c83d14722496a65f14bd0d4b087 Mon Sep 17 00:00:00 2001 +From b2bd397f26617697871221555e565fe98b3a04d0 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 Subject: [PATCH 12/30] net: dsa: mv88e6xxx: Use VLAN prio over IP when both @@ -27,7 +27,7 @@ main reasons for choosing the new default: 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 050a89c1b7e13..1888ddd9bfa42 100644 +index 050a89c1b7e1..1888ddd9bfa4 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3443,9 +3443,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) diff --git a/patches/linux/6.12.54/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.55/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 96% rename from patches/linux/6.12.54/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.55/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index 06de2858..fec8f663 100644 --- a/patches/linux/6.12.54/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.55/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,4 +1,4 @@ -From 82dd864cdbcb4600cc94fb8116181741e4d7dcd5 Mon Sep 17 00:00:00 2001 +From 78696793ecabeb762cb7208a956bd8614b042a93 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 Subject: [PATCH 13/30] [FIX] net: dsa: mv88e6xxx: Trap locally terminated @@ -31,7 +31,7 @@ cause all packets assigned to these VLANs to properly terminated. 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 1888ddd9bfa42..70eefc1b2140b 100644 +index 1888ddd9bfa4..70eefc1b2140 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2665,7 +2665,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port, @@ -118,7 +118,7 @@ index 1888ddd9bfa42..70eefc1b2140b 100644 return err; diff --git a/include/net/switchdev.h b/include/net/switchdev.h -index 8346b0d29542c..764cd3dd46454 100644 +index 8346b0d29542..764cd3dd4645 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -104,6 +104,10 @@ struct switchdev_obj_port_vlan { @@ -133,7 +133,7 @@ index 8346b0d29542c..764cd3dd46454 100644 #define SWITCHDEV_OBJ_PORT_VLAN(OBJ) \ diff --git a/net/dsa/user.c b/net/dsa/user.c -index ee0e5cf3f6d8e..6f81658598e53 100644 +index ee0e5cf3f6d8..6f81658598e5 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -1762,6 +1762,8 @@ static int dsa_user_vlan_rx_add_vid(struct net_device *dev, __be16 proto, diff --git a/patches/linux/6.12.54/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.55/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 98% rename from patches/linux/6.12.54/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.55/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index 8903661c..5524a928 100644 --- a/patches/linux/6.12.54/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.55/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,4 +1,4 @@ -From 7603244610f86436ea43cf30216a559348e9824c Mon Sep 17 00:00:00 2001 +From 031a462116a4e9c7fb467fe015db6fcfda40832e Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 Subject: [PATCH 14/30] net: phy: marvell10g: Support firmware loading on @@ -16,7 +16,7 @@ fall back. 1 file changed, 161 insertions(+) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c -index 6642eb642d4bd..79d9483419c05 100644 +index 6642eb642d4b..79d9483419c0 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -25,6 +25,7 @@ diff --git a/patches/linux/6.12.54/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.55/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 93% rename from patches/linux/6.12.54/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.55/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index 910dcac9..434f86c1 100644 --- a/patches/linux/6.12.54/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.55/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,4 +1,4 @@ -From 7eac5ba731d1d82bee6f28281bbfce4396f815b6 Mon Sep 17 00:00:00 2001 +From 364026f4180d57e32a5eea8099a38cc1e3c7d220 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 Subject: [PATCH 15/30] net: phy: marvell10g: Fix power-up when strapped to @@ -13,7 +13,7 @@ affected by this setting. 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c -index 79d9483419c05..2684840927769 100644 +index 79d9483419c0..268484092776 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -342,11 +342,23 @@ static int mv3310_power_down(struct phy_device *phydev) diff --git a/patches/linux/6.12.54/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.55/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 99% rename from patches/linux/6.12.54/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.55/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index a1ee4f31..f9e6eb24 100644 --- a/patches/linux/6.12.54/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.55/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,4 +1,4 @@ -From 3888add665b397e2a187a845ad4932f7ed025ef8 Mon Sep 17 00:00:00 2001 +From b79205cad9d17855547b3fc97ef0087325863682 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 Subject: [PATCH 16/30] net: phy: marvell10g: Add LED support for 88X3310 @@ -22,7 +22,7 @@ Trigger support: 1 file changed, 422 insertions(+) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c -index 2684840927769..9f8475b67ef74 100644 +index 268484092776..9f8475b67ef7 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -28,6 +28,7 @@ diff --git a/patches/linux/6.12.54/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.55/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 95% rename from patches/linux/6.12.54/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.55/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index 3a2861e5..1205a37a 100644 --- a/patches/linux/6.12.54/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.55/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,4 +1,4 @@ -From ef333330ab3851d369442fcb893f29c91c3df500 Mon Sep 17 00:00:00 2001 +From 1df463ebbbb0998d5c3577facbbefff518701bd4 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 Subject: [PATCH 17/30] net: phy: marvell10g: Support LEDs tied to a single @@ -19,7 +19,7 @@ versa for the SFP cage. 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c -index 9f8475b67ef74..82b2e9b55b673 100644 +index 9f8475b67ef7..82b2e9b55b67 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -192,6 +192,9 @@ struct mv3310_chip { diff --git a/patches/linux/6.12.54/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.55/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 91% rename from patches/linux/6.12.54/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.55/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index cef44c1f..41540760 100644 --- a/patches/linux/6.12.54/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.55/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,4 +1,4 @@ -From 26d63f458545be99063418cb9b0d8a55f23f50dd Mon Sep 17 00:00:00 2001 +From 0e171998dbdb85176a7e07ceec55a7d063a430dc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 Subject: [PATCH 18/30] net: phy: Do not resume PHY when attaching @@ -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 834624a61060e..d09872e1ac4ee 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.54/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.55/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 95% rename from patches/linux/6.12.54/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.55/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index bcd83141..abe70d3c 100644 --- a/patches/linux/6.12.54/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.55/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,4 +1,4 @@ -From 8cbb41f7fea940b39a74d62b0c732784552295b3 Mon Sep 17 00:00:00 2001 +From 36c56936e20123292732db1a84a5c9977c8b9e64 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 Subject: [PATCH 19/30] net: bridge: avoid classifying unknown multicast as @@ -27,7 +27,7 @@ Signed-off-by: Joachim Wiberg 7 files changed, 50 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h -index a5b743a2f7750..3bffc39d78009 100644 +index a5b743a2f775..3bffc39d7800 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -830,6 +830,7 @@ enum br_boolopt_id { @@ -39,7 +39,7 @@ index a5b743a2f7750..3bffc39d78009 100644 }; diff --git a/net/bridge/br.c b/net/bridge/br.c -index ed08717541fe7..b2d3a3de2d72b 100644 +index ed08717541fe..b2d3a3de2d72 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -277,6 +277,9 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on, @@ -62,7 +62,7 @@ index ed08717541fe7..b2d3a3de2d72b 100644 /* shouldn't be called with unsupported options */ WARN_ON(1); diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c -index 26b79feb385d2..f3ecc70a47dc3 100644 +index 26b79feb385d..f3ecc70a47dc 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -87,10 +87,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) @@ -102,7 +102,7 @@ index 26b79feb385d2..f3ecc70a47dc3 100644 br_stp_timer_init(br); br_multicast_init(br); diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c -index e19b583ff2c6d..1094364d96e0b 100644 +index e19b583ff2c6..1094364d96e0 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -198,14 +198,19 @@ static struct net_bridge_port *maybe_deliver( @@ -140,7 +140,7 @@ index e19b583ff2c6d..1094364d96e0b 100644 continue; break; diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c -index ceaa5a89b947f..e54d648db7de8 100644 +index ceaa5a89b947..e54d648db7de 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -212,7 +212,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb @@ -153,7 +153,7 @@ index ceaa5a89b947f..e54d648db7de8 100644 br_multicast_flood(mdst, skb, brmctx, local_rcv, false); } diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c -index 0a00c3f578156..1ae021be0a7b1 100644 +index 0a00c3f57815..1ae021be0a7b 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -3835,6 +3835,11 @@ static void br_multicast_err_count(const struct net_bridge *br, @@ -189,7 +189,7 @@ index 0a00c3f578156..1ae021be0a7b1 100644 ipv6_addr_is_all_snoopers(&ipv6_hdr(skb)->daddr)) br_ip6_multicast_mrd_rcv(brmctx, pmctx, skb); diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h -index 5026a256bf92d..db6903b288af1 100644 +index 5026a256bf92..db6903b288af 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -485,6 +485,7 @@ enum net_bridge_opts { diff --git a/patches/linux/6.12.54/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.55/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 92% rename from patches/linux/6.12.54/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.55/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index d095a786..374658c3 100644 --- a/patches/linux/6.12.54/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.55/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,4 +1,4 @@ -From 4b9ed883b270d38525b059e1f8b6804156987aee Mon Sep 17 00:00:00 2001 +From 7a275e85076167cd0607760a0f60a9d7a39b7221 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 Subject: [PATCH 20/30] net: bridge: Ignore router ports when forwarding L2 @@ -17,7 +17,7 @@ Signed-off-by: Joachim Wiberg 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h -index db6903b288af1..102d37f6e92d8 100644 +index db6903b288af..102d37f6e92d 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1090,7 +1090,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx, diff --git a/patches/linux/6.12.54/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.55/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 97% rename from patches/linux/6.12.54/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.55/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index b3c10c89..2cfa0669 100644 --- a/patches/linux/6.12.54/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.55/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,4 +1,4 @@ -From 4f0a2d70dd226e88c4ed904e25dfb4398a9b5a37 Mon Sep 17 00:00:00 2001 +From 646c04fdf8b5540df1f67aff9e66ae3583c46790 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 Subject: [PATCH 21/30] net: bridge: drop delay for applying strict multicast @@ -25,7 +25,7 @@ Signed-off-by: Joachim Wiberg 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c -index 1ae021be0a7b1..dd815b0fa8f83 100644 +index 1ae021be0a7b..dd815b0fa8f8 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1762,10 +1762,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t) @@ -164,7 +164,7 @@ index 1ae021be0a7b1..dd815b0fa8f83 100644 #endif diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h -index 102d37f6e92d8..2b9d99d98aeff 100644 +index 102d37f6e92d..2b9d99d98aef 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -80,7 +80,6 @@ struct bridge_mcast_own_query { diff --git a/patches/linux/6.12.54/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.55/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 94% rename from patches/linux/6.12.54/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.55/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index 763ab160..c9c7ee2d 100644 --- a/patches/linux/6.12.54/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.55/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,4 +1,4 @@ -From b2d1efd0fc32587a0433a81e474abfe349efc6f0 Mon Sep 17 00:00:00 2001 +From 0e76cb88ebbc7c6c00c95afee0fcde50f91ab252 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 Subject: [PATCH 22/30] net: bridge: Differentiate MDB additions from @@ -28,7 +28,7 @@ introducing a RTM_SETMDB events to be used in the latter scenario. 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h -index db7254d52d935..63508279df478 100644 +index db7254d52d93..63508279df47 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -134,6 +134,8 @@ enum { @@ -41,7 +41,7 @@ index db7254d52d935..63508279df478 100644 RTM_NEWNSID = 88, #define RTM_NEWNSID RTM_NEWNSID diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c -index 7e1ad229e1330..3b1873e7c499a 100644 +index 7e1ad229e133..3b1873e7c499 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -734,7 +734,7 @@ static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg, @@ -63,7 +63,7 @@ index 7e1ad229e1330..3b1873e7c499a 100644 if (br_multicast_should_handle_mode(brmctx, cfg->group.proto)) br_multicast_star_g_handle_mode(pg, cfg->filter_mode); diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c -index dd815b0fa8f83..41ab527953da2 100644 +index dd815b0fa8f8..41ab527953da 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -619,7 +619,7 @@ static void br_multicast_fwd_src_handle(struct net_bridge_group_src *src) diff --git a/patches/linux/6.12.54/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.55/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 94% rename from patches/linux/6.12.54/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.55/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index c124c46e..e34f51a0 100644 --- a/patches/linux/6.12.54/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.55/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,4 +1,4 @@ -From b3e0f49de90b55e8e9f5ea26f8832a59e0b4a1df Mon Sep 17 00:00:00 2001 +From c1e4eb8722b50879071ad25d286806c7950b72aa Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 Subject: [PATCH 23/30] nvmem: layouts: onie-tlv: Let device probe even when @@ -18,7 +18,7 @@ simply refrain from registering any cells in those cases. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/layouts/onie-tlv.c b/drivers/nvmem/layouts/onie-tlv.c -index 0967a32319a28..48547d5bb5020 100644 +index 0967a32319a2..48547d5bb502 100644 --- a/drivers/nvmem/layouts/onie-tlv.c +++ b/drivers/nvmem/layouts/onie-tlv.c @@ -197,7 +197,7 @@ static int onie_tlv_parse_table(struct nvmem_layout *layout) diff --git a/patches/linux/6.12.54/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.55/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 91% rename from patches/linux/6.12.54/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.55/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index 88392497..226e0762 100644 --- a/patches/linux/6.12.54/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.55/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,4 +1,4 @@ -From 1b63f12f15cae44a20d9d719406ba290d1f8bb4e Mon Sep 17 00:00:00 2001 +From e740be13e3e221653b40f0125e7b8a81705c5685 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 Subject: [PATCH 24/30] usb: core: adjust log level for unauthorized devices @@ -15,7 +15,7 @@ Signed-off-by: Joachim Wiberg 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c -index 0c3f12daac79e..037f03aace9f9 100644 +index 0c3f12daac79..037f03aace9f 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -335,10 +335,10 @@ static int usb_probe_interface(struct device *dev) @@ -32,7 +32,7 @@ index 0c3f12daac79e..037f03aace9f9 100644 return error; } diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c -index b134bff5c3fe3..60575a01a8104 100644 +index b134bff5c3fe..60575a01a810 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -247,7 +247,7 @@ int usb_generic_driver_probe(struct usb_device *udev) diff --git a/patches/linux/6.12.54/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.55/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 93% rename from patches/linux/6.12.54/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.12.55/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index f36877dd..33e31202 100644 --- a/patches/linux/6.12.54/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.12.55/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,4 +1,4 @@ -From 92f3aab1d2223100fa88025c376ec846a58fdff9 Mon Sep 17 00:00:00 2001 +From d1d4c3defdcd9add91e47b6a11e0b789486144b1 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 Subject: [PATCH 25/30] net: dsa: mv88e6xxx: collapse disabled state into @@ -23,7 +23,7 @@ Signed-off-by: Joachim Wiberg 1 file changed, 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c -index 84900814c4562..91e58297594cb 100644 +index 84900814c456..91e58297594c 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -791,8 +791,6 @@ int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state) diff --git a/patches/linux/6.12.54/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.55/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 97% rename from patches/linux/6.12.54/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.12.55/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index 565388ac..560b7a41 100644 --- a/patches/linux/6.12.54/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.12.55/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,4 +1,4 @@ -From 3185e1be144ab572cde37cae04f6c06b664f49fe Mon Sep 17 00:00:00 2001 +From bbff2029c3791a210e7e1aadd70c600a4dda5712 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 Subject: [PATCH 26/30] net: dsa: mv88e6xxx: Only activate LAG offloading when @@ -51,7 +51,7 @@ CPU; egress traffic always relies on software hashing. 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 70eefc1b2140b..e0db6333e418c 100644 +index 70eefc1b2140..e0db6333e418 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3106,6 +3106,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, diff --git a/patches/linux/6.12.54/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.12.55/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch similarity index 92% rename from patches/linux/6.12.54/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch rename to patches/linux/6.12.55/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch index 40dea3c5..ae0def5a 100644 --- a/patches/linux/6.12.54/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch +++ b/patches/linux/6.12.55/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch @@ -1,4 +1,4 @@ -From fbb76ff142c2bf89fa6d8355c423c9493f4636aa Mon Sep 17 00:00:00 2001 +From ce7e3863f0be13f50a732d89b506be756f3cd1e1 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 11 Aug 2024 11:27:35 +0200 Subject: [PATCH 27/30] net: usb: r8152: add r8153b support for link/activity @@ -19,7 +19,7 @@ Signed-off-by: Joachim Wiberg 1 file changed, 8 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 2cab046749a92..c9947ad320ff9 100644 +index 3fcd2b736c5e..531712943118 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -41,6 +41,11 @@ diff --git a/patches/linux/6.12.54/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch b/patches/linux/6.12.55/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch similarity index 93% rename from patches/linux/6.12.54/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch rename to patches/linux/6.12.55/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch index 867b9ca9..87c681e1 100644 --- a/patches/linux/6.12.54/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch +++ b/patches/linux/6.12.55/0028-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch @@ -1,4 +1,4 @@ -From 45ea5d760c56f191db02bd6dc9f490a1a1abf6ca Mon Sep 17 00:00:00 2001 +From 73e0938b78281d8adf4caf18e4f46b29d9069042 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 10 Aug 2025 18:52:54 +0200 Subject: [PATCH 28/30] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to @@ -16,7 +16,7 @@ Signed-off-by: Joachim Wiberg 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 ed79ad1ae8716..1c7c666e3173b 100644 +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 { diff --git a/patches/linux/6.12.54/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/patches/linux/6.12.55/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch similarity index 97% rename from patches/linux/6.12.54/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch rename to patches/linux/6.12.55/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch index 534e0516..eec75134 100644 --- a/patches/linux/6.12.54/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch +++ b/patches/linux/6.12.55/0029-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch @@ -1,4 +1,4 @@ -From 8fc0783e15dbadb4d3427b594e8794a9884f43e2 Mon Sep 17 00:00:00 2001 +From 10334fa97b79df7806b856b0031d68fc7c29abdd Mon Sep 17 00:00:00 2001 From: Mattias Walström Date: Wed, 20 Aug 2025 21:38:24 +0200 Subject: [PATCH 29/30] drm/panel-simple: Add a timing for the Raspberry Pi 7" @@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 82db3daf4f81a..3699cef24ea6f 100644 +index 82db3daf4f81..3699cef24ea6 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -391,7 +391,8 @@ static int panel_simple_get_modes(struct drm_panel *panel, diff --git a/patches/linux/6.12.54/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch b/patches/linux/6.12.55/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch similarity index 97% rename from patches/linux/6.12.54/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch rename to patches/linux/6.12.55/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch index f877a4f5..b883c649 100644 --- a/patches/linux/6.12.54/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch +++ b/patches/linux/6.12.55/0030-input-touchscreen-edt-ft5x06-Add-polled-mode.patch @@ -1,4 +1,4 @@ -From 9674b6eb79d683a2d67ded43a9a0579a59b6e4aa Mon Sep 17 00:00:00 2001 +From 3a755a156023b1388e5bdc132306513e8f6c61a8 Mon Sep 17 00:00:00 2001 From: Mattias Walström Date: Thu, 21 Aug 2025 11:20:23 +0200 Subject: [PATCH 30/30] input:touchscreen:edt-ft5x06: Add polled mode @@ -11,7 +11,7 @@ to poll the touchscreen. 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c -index 85c6d8ce003f3..e615199151375 100644 +index 85c6d8ce003f..e61519915137 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -77,6 +77,9 @@ diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash index 866a5fd5..1a76e460 100644 --- a/patches/linux/linux.hash +++ b/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Calculated with ../utils/kernel-refresh.sh -sha256 1b0dcd3390efeec44e528748609bafcf36eae895bb68c8f62ac5e5940943de62 linux-6.12.54.tar.xz +sha256 328f8f4608a653063a5fd82d29b17163faab2825fa419fa85b961740a342fb9f linux-6.12.55.tar.xz