kernelkit · wkz · Oct 23, 2025 · Oct 23, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...6xxx-Fix-timeout-on-waiting-for-PPU.patch → ...6xxx-Fix-timeout-on-waiting-for-PPU.patch b/...6xxx-Fix-timeout-on-waiting-for-PPU.patch → ...6xxx-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 <[email protected]>
 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/...-Improve-indirect-register-access-p.patch → ...-Improve-indirect-register-access-p.patch b/...-Improve-indirect-register-access-p.patch → ...-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 <[email protected]>
 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/...-Honor-ports-being-managed-via-in-b.patch → ...-Honor-ports-being-managed-via-in-b.patch b/...-Honor-ports-being-managed-via-in-b.patch → ...-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 <[email protected]>
 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/...-Limit-rsvd2cpu-policy-to-user-port.patch → ...-Limit-rsvd2cpu-policy-to-user-port.patch b/...-Limit-rsvd2cpu-policy-to-user-port.patch → ...-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 <[email protected]>
 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/...sa-mv88e6xxx-Add-LED-infrastructure.patch → ...sa-mv88e6xxx-Add-LED-infrastructure.patch b/...sa-mv88e6xxx-Add-LED-infrastructure.patch → ...sa-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 <[email protected]>
 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/...mv88e6xxx-Add-LED-support-for-6393X.patch → ...mv88e6xxx-Add-LED-support-for-6393X.patch b/...mv88e6xxx-Add-LED-support-for-6393X.patch → ...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 <[email protected]>
 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/...se-tag-priority-as-initial-skb-prio.patch → ...se-tag-priority-as-initial-skb-prio.patch b/...se-tag-priority-as-initial-skb-prio.patch → ...se-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 <[email protected]>
 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/...DB-memberships-whose-L2-addresses-o.patch → ...DB-memberships-whose-L2-addresses-o.patch b/...DB-memberships-whose-L2-addresses-o.patch → ...DB-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 <[email protected]>
 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/...-EtherType-based-priority-overrides.patch → ...-EtherType-based-priority-overrides.patch b/...-EtherType-based-priority-overrides.patch → ...-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 <[email protected]>
 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/...-Support-EtherType-based-priority-o.patch → ...-Support-EtherType-based-priority-o.patch b/...-Support-EtherType-based-priority-o.patch → ...-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 <[email protected]>
 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/...-mv88e6xxx-Add-mqprio-qdisc-support.patch → ...-mv88e6xxx-Add-mqprio-qdisc-support.patch b/...-mv88e6xxx-Add-mqprio-qdisc-support.patch → ...-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 <[email protected]>
 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,