Upgrade kernel to 6.6.46

2026-08-03 06:13:02 +02:00 · 2024-08-16 16:32:22 +02:00
parent 3da46f7249
commit 8d6bf14937
35 changed files with 139 additions and 139 deletions
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_MERGED_USR=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.46"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_MERGED_USR=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.46"
 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
@@ -1,4 +1,4 @@
-From 7dc780943c795dfbf03ec34c00a892f2e4d53b5c Mon Sep 17 00:00:00 2001
+From c11849437a9b58133900e901e8520e46fd670033 Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
 Date: Thu, 25 Jan 2024 21:36:59 +0100
 Subject: [PATCH 01/33] net: phy: add support for PHY LEDs polarity modes
@@ -62,7 +62,7 @@ index c895cd178e6a..82666d5fd06c 100644
 	if (phydev->drv->led_brightness_set)
 		cdev->brightness_set_blocking = phy_led_set_brightness;
 diff --git a/include/linux/phy.h b/include/linux/phy.h
-index 1351b802ffcf..7e82fb9331b9 100644
+index 5aa30ee99810..6783d175f518 100644
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
@@ -849,6 +849,15 @@ struct phy_plca_status {
@@ -102,5 +102,5 @@ index 1351b802ffcf..7e82fb9331b9 100644
 #define to_phy_driver(d) container_of(to_mdio_common_driver(d),		\
 				      struct phy_driver, mdiodrv)
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 9799ba12ae776794b2c4e48e5a6799aab8cf1370 Mon Sep 17 00:00:00 2001
+From 3d1c94102137d719c5ec499492cafdccad57ff09 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 4 Dec 2023 11:08:11 +0100
 Subject: [PATCH 02/33] net: mvmdio: Support setting the MDC frequency on XSMI
@@ -88,5 +88,5 @@ index 2ef613a237d8..11f564e88a7d 100644
 		dev->clk[0] = clk_get(&pdev->dev, NULL);
 		if (PTR_ERR(dev->clk[0]) == -EPROBE_DEFER) {
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 74f91e6ff849e5a8cfd754ea58e86809a1e28343 Mon Sep 17 00:00:00 2001
+From 1fb08332958226206c8db121397d45d4b18377c8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:23 +0100
 Subject: [PATCH 03/33] net: dsa: mv88e6xxx: Create API to read a single stat
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 2 files changed, 106 insertions(+), 83 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 9571e1b1e59e..ddeff5357b98 100644
+index 3877744193e2..14a9bba5ed0b 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1072,7 +1072,7 @@ static struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {
@@ -168,7 +168,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 
 	mv88e6xxx_reg_lock(chip);
 	if (chip->info->ops->serdes_get_stats) {
-@@ -4057,7 +4079,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
+@@ -4058,7 +4080,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -177,7 +177,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4095,7 +4117,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
+@@ -4096,7 +4118,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -186,7 +186,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.mgmt_rsvd2cpu = mv88e6185_g2_mgmt_rsvd2cpu,
 	.ppu_enable = mv88e6185_g1_ppu_enable,
 	.ppu_disable = mv88e6185_g1_ppu_disable,
-@@ -4136,7 +4158,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
+@@ -4137,7 +4159,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -195,7 +195,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4178,7 +4200,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
+@@ -4179,7 +4201,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -204,7 +204,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4221,7 +4243,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
+@@ -4222,7 +4244,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -213,7 +213,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4270,7 +4292,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
+@@ -4271,7 +4293,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -222,7 +222,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -4327,7 +4349,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
+@@ -4328,7 +4350,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -231,7 +231,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4365,7 +4387,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {
+@@ -4366,7 +4388,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -240,7 +240,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4413,7 +4435,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {
+@@ -4414,7 +4436,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -249,7 +249,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4462,7 +4484,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {
+@@ -4463,7 +4485,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -258,7 +258,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4515,7 +4537,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {
+@@ -4516,7 +4538,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -267,7 +267,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4564,7 +4586,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
+@@ -4565,7 +4587,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -276,7 +276,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4611,7 +4633,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
+@@ -4612,7 +4634,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -285,7 +285,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4660,7 +4682,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
+@@ -4661,7 +4683,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -294,7 +294,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -4720,7 +4742,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
+@@ -4721,7 +4743,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -303,7 +303,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -4778,7 +4800,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
+@@ -4779,7 +4801,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -312,7 +312,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -4839,7 +4861,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
+@@ -4840,7 +4862,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -321,7 +321,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -4894,7 +4916,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = {
+@@ -4895,7 +4917,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6250_stats_get_sset_count,
 	.stats_get_strings = mv88e6250_stats_get_strings,
@@ -330,7 +330,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6250_watchdog_ops,
-@@ -4943,7 +4965,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
+@@ -4944,7 +4966,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -339,7 +339,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5004,7 +5026,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
+@@ -5005,7 +5027,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -348,7 +348,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5053,7 +5075,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
+@@ -5054,7 +5076,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -357,7 +357,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5104,7 +5126,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
+@@ -5105,7 +5127,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -366,7 +366,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5164,7 +5186,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {
+@@ -5165,7 +5187,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -375,7 +375,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -5210,7 +5232,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
+@@ -5211,7 +5233,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -384,7 +384,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -5261,7 +5283,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
+@@ -5262,7 +5284,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,
 	.stats_get_strings = mv88e6095_stats_get_strings,
@@ -393,7 +393,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6095_g1_set_cpu_port,
 	.set_egress_port = mv88e6095_g1_set_egress_port,
 	.watchdog_ops = &mv88e6097_watchdog_ops,
-@@ -5325,7 +5347,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
+@@ -5326,7 +5348,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -402,7 +402,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5389,7 +5411,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
+@@ -5390,7 +5412,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -411,7 +411,7 @@ index 9571e1b1e59e..ddeff5357b98 100644
 	.set_cpu_port = mv88e6390_g1_set_cpu_port,
 	.set_egress_port = mv88e6390_g1_set_egress_port,
 	.watchdog_ops = &mv88e6390_watchdog_ops,
-@@ -5453,7 +5475,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
+@@ -5454,7 +5476,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
 	.stats_get_strings = mv88e6320_stats_get_strings,
@@ -473,5 +473,5 @@ index f48a3c0ac7f9..c34caf9815c5 100644
 {
 	return chip->info->max_sid > 0 &&
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 60cf097c45e556e2007b6bb9599bdf4cffdc2def Mon Sep 17 00:00:00 2001
+From d1ff7f41334ce40b50bc79e7f7f484932f431bfe Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:25 +0100
 Subject: [PATCH 04/33] net: dsa: mv88e6xxx: Give each hw stat an ID
@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 1 file changed, 75 insertions(+), 63 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index ddeff5357b98..b49db519dd58 100644
+index 14a9bba5ed0b..f6efd0bad710 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1009,66 +1009,78 @@ static int mv88e6xxx_stats_snapshot(struct mv88e6xxx_chip *chip, int port)
@@ -191,5 +191,5 @@ index ddeff5357b98..b49db519dd58 100644
 
 	for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 85a07a02fdc95e514f9a277c378ca40952160c91 Mon Sep 17 00:00:00 2001
+From 640ab238cbcf0cb15fad064023180e18dc5334bb Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:26 +0100
 Subject: [PATCH 05/33] net: dsa: mv88e6xxx: Add "eth-mac" counter group
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 1 file changed, 39 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index b49db519dd58..c72962268c9b 100644
+index f6efd0bad710..695688defda5 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1390,6 +1390,44 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
@@ -65,7 +65,7 @@ index b49db519dd58..c72962268c9b 100644
 static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
-@@ -6957,6 +6995,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -6958,6 +6996,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.phylink_mac_link_up	= mv88e6xxx_mac_link_up,
 	.get_strings		= mv88e6xxx_get_strings,
 	.get_ethtool_stats	= mv88e6xxx_get_ethtool_stats,
@@ -74,5 +74,5 @@ index b49db519dd58..c72962268c9b 100644
 	.port_max_mtu		= mv88e6xxx_get_max_mtu,
 	.port_change_mtu	= mv88e6xxx_change_mtu,
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From b9d52352af8d243463c18962fbf4dc7e4a48c367 Mon Sep 17 00:00:00 2001
+From 5a8d8971ed506fefe689eaf0c1e5d622b88a9826 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:27 +0100
 Subject: [PATCH 06/33] net: dsa: mv88e6xxx: Limit histogram counters to
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 2 files changed, 6 insertions(+), 7 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index c72962268c9b..bfa693fe28ae 100644
+index 695688defda5..08ff05000515 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1275,7 +1275,7 @@ static size_t mv88e6095_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
@@ -96,5 +96,5 @@ index 7ef0f4426ad7..9820cd596757 100644
 		return err;
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 2adc32f6048a0f5451f76e0af01c379d9466b02e Mon Sep 17 00:00:00 2001
+From fdf336096b8bc0577d194778dfe0c53e91ab820e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:28 +0100
 Subject: [PATCH 07/33] net: dsa: mv88e6xxx: Add "rmon" counter group support
@@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 1 file changed, 42 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index bfa693fe28ae..f156bb2c75f4 100644
+index 08ff05000515..1fd4fc9ace61 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1428,6 +1428,47 @@ static void mv88e6xxx_get_eth_mac_stats(struct dsa_switch *ds, int port,
@@ -67,7 +67,7 @@ index bfa693fe28ae..f156bb2c75f4 100644
 static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
-@@ -6996,6 +7037,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -6997,6 +7038,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.get_strings		= mv88e6xxx_get_strings,
 	.get_ethtool_stats	= mv88e6xxx_get_ethtool_stats,
 	.get_eth_mac_stats	= mv88e6xxx_get_eth_mac_stats,
@@ -76,5 +76,5 @@ index bfa693fe28ae..f156bb2c75f4 100644
 	.port_max_mtu		= mv88e6xxx_get_max_mtu,
 	.port_change_mtu	= mv88e6xxx_change_mtu,
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 59413f2b736fb536c4986243014ce935034519b2 Mon Sep 17 00:00:00 2001
+From 4b150e48c66e441a01c0916e8295d1a59dae21a6 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
 Subject: [PATCH 09/33] net: dsa: mv88e6xxx: Add LED infrastructure
@@ -29,7 +29,7 @@ index a9a9651187db..6720d9303914 100644
 mv88e6xxx-objs += pcs-6352.o
 mv88e6xxx-objs += pcs-639x.o
 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index f156bb2c75f4..cc44fb4c9017 100644
+index 1fd4fc9ace61..bf26941e4e31 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -37,6 +37,7 @@
@@ -40,7 +40,7 @@ index f156bb2c75f4..cc44fb4c9017 100644
 #include "phy.h"
 #include "port.h"
 #include "ptp.h"
-@@ -4082,7 +4083,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)
+@@ -4083,7 +4084,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)
 			return err;
 	}
 
@@ -309,5 +309,5 @@ index 000000000000..8afa2a0c0527
 +
 +#endif /* _MV88E6XXX_LEDS_H */
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From dc78ddfa863eaa7fbd98b9b87a1f1e690d912154 Mon Sep 17 00:00:00 2001
+From 15cf831abbb34b3448e34a647f877993d05617b0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
 Subject: [PATCH 10/33] net: dsa: mv88e6xxx: Add LED support for 6393X
@@ -17,10 +17,10 @@ Trigger support:
 5 files changed, 269 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index cc44fb4c9017..70c1abd0a167 100644
+index bf26941e4e31..24c5663b5944 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5594,6 +5594,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
+@@ -5595,6 +5595,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6390_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -355,5 +355,5 @@ index ddadeb9bfdae..7157864dc20f 100644
 			       enum mv88e6xxx_egress_direction direction,
 			       int port);
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From be6259ad15f4c9ff7779176bfd727af9d5cb06b5 Mon Sep 17 00:00:00 2001
+From cd513e5fa94fe4e595248f10e2c819fa4a5faf5e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 11/33] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on
@@ -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 70c1abd0a167..a1deb7fb1f9b 100644
+index 24c5663b5944..bd3ef8deb23d 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -87,7 +87,7 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val)
@@ -26,5 +26,5 @@ index 70c1abd0a167..a1deb7fb1f9b 100644
 	int err;
 	int i;
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 6e948195d25d947fe30fb0a2074918708eb4d0b4 Mon Sep 17 00:00:00 2001
+From 01782f2f13cffb1698bd774521e9a371d63901ba Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 12/33] net: dsa: Support MDB memberships whose L2 addresses
@@ -68,5 +68,5 @@ index 1a42f9317334..2ad13e23635e 100644
 
 	a = dsa_mac_addr_find(&dp->mdbs, mdb->addr, mdb->vid, db);
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 109ecf18f80367a341b5d4f43f986867b13dad7c Mon Sep 17 00:00:00 2001
+From 4f23cbbb2851495ff86d0879618dfdb336ff214b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 13/33] net: phy: marvell10g: Support firmware loading on
@@ -235,5 +235,5 @@ index d4bb90d76881..ec9ea5e947f9 100644
 +MODULE_FIRMWARE("mrvl/x3310fw.hdr");
 MODULE_LICENSE("GPL");
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From aacf17a788992e656a8ec923cf8f58c644eaf950 Mon Sep 17 00:00:00 2001
+From 561dca36644be70a4c485154c165b3ada6c1c5e9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 14/33] net: phy: marvell10g: Fix power-up when strapped to
@@ -44,5 +44,5 @@ index ec9ea5e947f9..5a1e89d3fbeb 100644
 	/* Sometimes, the power down bit doesn't clear immediately, and
 	 * a read of this register causes the bit not to clear. Delay
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 5ea564da31926e72c81da07473a2e5ffb8f3690c Mon Sep 17 00:00:00 2001
+From 12e6b629426c70aa01fba85266f2af2489285306 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 15/33] net: phy: marvell10g: Add LED support for 88X3310
@@ -511,5 +511,5 @@ index 5a1e89d3fbeb..745aeb367ef8 100644
 	{
 		.phy_id		= MARVELL_PHY_ID_88X3310,
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From ba07678f1b3e734e7ed6716c6834093cde89969e Mon Sep 17 00:00:00 2001
+From 1de94e0474fbda4163869dd011f65b7bf759245d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 16/33] net: phy: marvell10g: Support LEDs tied to a single
@@ -74,5 +74,5 @@ index 745aeb367ef8..58c2f9626ba3 100644
 	 * device tree specifies a mode that of_phy_led() considers to
 	 * be a non-default configuration. I.e., something other than
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 43a0e80675f375c38d9bc4491c570d83449df0ef Mon Sep 17 00:00:00 2001
+From 4535990fd3cbffb3b80cfb07f80fcddebd73a582 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 17/33] nvmem: layouts: onie-tlv: Let device probe even when
@@ -49,5 +49,5 @@ index 59fc87ccfcff..834c46e46d0a 100644
 	data = table + hdr_len;
 	ret = onie_tlv_add_cells(dev, nvmem, data_len, data);
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 0bef041f49f0e65d5d74e99a72e16a23826ff43f Mon Sep 17 00:00:00 2001
+From e597f57d5d9dc1c1b009b3a7d0659910f63e0c90 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 18/33] net: bridge: avoid classifying unknown multicast as
@@ -102,7 +102,7 @@ index 42d4c3727bf7..d4c2fc34051f 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 d97064d460dc..90bb1acbae57 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(
@@ -153,10 +153,10 @@ index e09000e38d07..b3247bd4f8de 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 38373b4fb7dd..994dacaaab7e 100644
+index c38244d60ff8..8de12a235095 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -3775,6 +3775,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
+@@ -3773,6 +3773,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
 	u64_stats_update_end(&pstats->syncp);
 }
 
@@ -168,7 +168,7 @@ index 38373b4fb7dd..994dacaaab7e 100644
 static void br_multicast_pim(struct net_bridge_mcast *brmctx,
 			     struct net_bridge_mcast_port *pmctx,
 			     const struct sk_buff *skb)
-@@ -3821,7 +3826,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
+@@ -3819,7 +3824,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
 
 	if (err == -ENOMSG) {
 		if (!ipv4_is_local_multicast(ip_hdr(skb)->daddr)) {
@@ -178,7 +178,7 @@ index 38373b4fb7dd..994dacaaab7e 100644
 		} else if (pim_ipv4_all_pim_routers(ip_hdr(skb)->daddr)) {
 			if (ip_hdr(skb)->protocol == IPPROTO_PIM)
 				br_multicast_pim(brmctx, pmctx, skb);
-@@ -3890,7 +3896,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
+@@ -3888,7 +3894,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
 
 	if (err == -ENOMSG || err == -ENODATA) {
 		if (!ipv6_addr_is_ll_all_nodes(&ipv6_hdr(skb)->daddr))
@@ -232,5 +232,5 @@ index e4f1a08322da..8e12efdba2e6 100644
 					  struct sk_buff *skb)
 {
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 43b5457d147b68d40cf28c70f7c6adfe478cee11 Mon Sep 17 00:00:00 2001
+From 6f1699021fcc0940f1632febe6769a5b08856153 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 19/33] net: bridge: Ignore router ports when forwarding L2
@@ -33,5 +33,5 @@ index 8e12efdba2e6..5142decee8e7 100644
 
 static inline struct net_bridge_port *
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 466ce3caf20f60eb1c395329ba34650516b86863 Mon Sep 17 00:00:00 2001
+From fb8bcf342a9d852dbfe712416aa462f5623125c9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 20/33] net: dsa: Support EtherType based priority overrides
@@ -113,5 +113,5 @@ index 48db91b33390..18d913bcd180 100644
 		break;
 	case IEEE_8021QAZ_APP_SEL_DSCP:
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 901b65926188ebf5e7c4658a63ebc60b57fb5b04 Mon Sep 17 00:00:00 2001
+From 0e4e5ced35d74ad6011b88c18069e8507f425190 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 21/33] net: dsa: mv88e6xxx: Support EtherType based priority
@@ -15,7 +15,7 @@ Organization: Addiva Elektronik
 6 files changed, 207 insertions(+), 4 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index a1deb7fb1f9b..70bb59afbe89 100644
+index bd3ef8deb23d..09b22a5a6e45 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1686,6 +1686,11 @@ static int mv88e6xxx_rmu_setup(struct mv88e6xxx_chip *chip)
@@ -38,7 +38,7 @@ index a1deb7fb1f9b..70bb59afbe89 100644
 
 	err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,
 				       SPEED_UNFORCED, DUPLEX_UNFORCED,
-@@ -6492,6 +6498,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
+@@ -6493,6 +6499,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
 	chip->dev = dev;
 
 	mutex_init(&chip->reg_lock);
@@ -46,7 +46,7 @@ index a1deb7fb1f9b..70bb59afbe89 100644
 	INIT_LIST_HEAD(&chip->mdios);
 	idr_init(&chip->policies);
 	INIT_LIST_HEAD(&chip->msts);
-@@ -7024,6 +7031,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index,
+@@ -7025,6 +7032,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index,
 	return err_sync ? : err_pvt;
 }
 
@@ -108,7 +108,7 @@ index a1deb7fb1f9b..70bb59afbe89 100644
 static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.get_tag_protocol	= mv88e6xxx_get_tag_protocol,
 	.change_tag_protocol	= mv88e6xxx_change_tag_protocol,
-@@ -7090,6 +7152,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -7091,6 +7153,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.crosschip_lag_change	= mv88e6xxx_crosschip_lag_change,
 	.crosschip_lag_join	= mv88e6xxx_crosschip_lag_join,
 	.crosschip_lag_leave	= mv88e6xxx_crosschip_lag_leave,
@@ -371,5 +371,5 @@ index 7157864dc20f..7edb04c41ac8 100644
 				    bool message_port);
 int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port,
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 884f5efcdc9925097fdc3148ade4a6b7442658f7 Mon Sep 17 00:00:00 2001
+From 145aa1ce386559d515753835822b4c3cb936845c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 22/33] net: phy: Do not resume PHY when attaching
@@ -32,5 +32,5 @@ index 82666d5fd06c..3bd17166d211 100644
 		phy_led_triggers_register(phydev);
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 7790d2c0c156bd12eabcc714be82566a72601181 Mon Sep 17 00:00:00 2001
+From 7f1a5cd654c494e281f7602862f7816181bcaef6 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 23/33] net: dsa: mv88e6xxx: Improve indirect register access
@@ -22,10 +22,10 @@ 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 70bb59afbe89..1b4cea6f79a3 100644
+index 09b22a5a6e45..62e0a4e5a9bb 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -6455,6 +6455,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
+@@ -6456,6 +6456,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
 	/* Update the compatible info with the probed one */
 	chip->info = info;
 
@@ -210,5 +210,5 @@ index c6c71d5757f5..788cf68b7b33 100644
 		       struct mii_bus *bus, int sw_addr);
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 1fa6e315f98f1b660982f0021b8972f61c0ee607 Mon Sep 17 00:00:00 2001
+From 16ef0d66acb9bccb539b5040333ece6b57d9a9b6 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 24/33] net: bridge: drop delay for applying strict multicast
@@ -25,7 +25,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 2 files changed, 8 insertions(+), 38 deletions(-)

 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 994dacaaab7e..8fcd8faf99f3 100644
+index 8de12a235095..919abce8b5ac 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
@@ -1761,10 +1761,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
@@ -39,7 +39,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
 					    struct br_ip *ip,
 					    struct sk_buff *skb)
-@@ -3197,12 +3193,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
+@@ -3195,12 +3191,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
 
 static void
 br_multicast_update_query_timer(struct net_bridge_mcast *brmctx,
@@ -53,7 +53,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
 }
 
-@@ -3393,13 +3385,12 @@ static void
+@@ -3391,13 +3383,12 @@ static void
 br_ip4_multicast_query_received(struct net_bridge_mcast *brmctx,
 				struct net_bridge_mcast_port *pmctx,
 				struct bridge_mcast_other_query *query,
@@ -69,7 +69,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	br_ip4_multicast_mark_router(brmctx, pmctx);
 }
 
-@@ -3408,13 +3399,12 @@ static void
+@@ -3406,13 +3397,12 @@ static void
 br_ip6_multicast_query_received(struct net_bridge_mcast *brmctx,
 				struct net_bridge_mcast_port *pmctx,
 				struct bridge_mcast_other_query *query,
@@ -85,7 +85,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	br_ip6_multicast_mark_router(brmctx, pmctx);
 }
 #endif
-@@ -3468,7 +3458,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3466,7 +3456,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
 
 		br_ip4_multicast_query_received(brmctx, pmctx,
 						&brmctx->ip4_other_query,
@@ -94,7 +94,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 		goto out;
 	}
 
-@@ -3556,7 +3546,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3554,7 +3544,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
 
 		br_ip6_multicast_query_received(brmctx, pmctx,
 						&brmctx->ip6_other_query,
@@ -103,7 +103,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 		goto out;
 	} else if (!group) {
 		goto out;
-@@ -4064,8 +4054,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4062,8 +4052,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
 		    br_ip4_multicast_local_router_expired, 0);
 	timer_setup(&brmctx->ip4_other_query.timer,
 		    br_ip4_multicast_querier_expired, 0);
@@ -112,7 +112,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	timer_setup(&brmctx->ip4_own_query.timer,
 		    br_ip4_multicast_query_expired, 0);
 #if IS_ENABLED(CONFIG_IPV6)
-@@ -4073,8 +4061,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4071,8 +4059,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
 		    br_ip6_multicast_local_router_expired, 0);
 	timer_setup(&brmctx->ip6_other_query.timer,
 		    br_ip6_multicast_querier_expired, 0);
@@ -121,7 +121,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	timer_setup(&brmctx->ip6_own_query.timer,
 		    br_ip6_multicast_query_expired, 0);
 #endif
-@@ -4209,12 +4195,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
+@@ -4207,12 +4193,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
 {
 	del_timer_sync(&brmctx->ip4_mc_router_timer);
 	del_timer_sync(&brmctx->ip4_other_query.timer);
@@ -134,7 +134,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	del_timer_sync(&brmctx->ip6_own_query.timer);
 #endif
 }
-@@ -4642,8 +4626,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
+@@ -4640,8 +4624,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
 
 int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
 {
@@ -143,7 +143,7 @@ index 994dacaaab7e..8fcd8faf99f3 100644
 	val = !!val;
 
 	spin_lock_bh(&brmctx->br->multicast_lock);
-@@ -4654,19 +4636,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
+@@ -4652,19 +4634,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
 	if (!val)
 		goto unlock;
 
@@ -186,5 +186,5 @@ index 5142decee8e7..db4f0705661a 100644
 
 static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From a49930cebd3cd36969477db0e93dc74a74f62da9 Mon Sep 17 00:00:00 2001
+From 966ef6027b1b2797c069adfe0cc274f1c72b80cb Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 25/33] 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 1b4cea6f79a3..6cff65788cc0 100644
+index 62e0a4e5a9bb..58ba6af586a3 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -945,6 +945,9 @@ static void mv88e6xxx_mac_link_down(struct dsa_switch *ds, int port,
@@ -42,5 +42,5 @@ index 1b4cea6f79a3..6cff65788cc0 100644
 
 	mv88e6xxx_reg_lock(chip);
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 4eefae8def6cc145bba9eb022d03956719f772fd Mon Sep 17 00:00:00 2001
+From e10370efdce8698e87b729027b35bd93e1b68498 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 21:35:26 +0200
 Subject: [PATCH 26/33] net: dsa: mv88e6xxx: Fix port policy config on 6393X
@@ -40,5 +40,5 @@ index aba78838171b..3f5759992baf 100644
 +	return mv88e6393x_port_policy_write(chip, port, ptr << 8, reg);
 }
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From f69ea5c9d1d50eda6b51d873df3979a834baaee0 Mon Sep 17 00:00:00 2001
+From fecfb8b284c458b010f33de19e3d9937a22a5c09 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 27/33] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
@@ -97,5 +97,5 @@ index 3f5759992baf..3dfe0f7805a0 100644
 		return err;
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 9a10611cbadfdebbad360b321126360870fe8177 Mon Sep 17 00:00:00 2001
+From 7889c66642251ae3ddad342194c2a3e3db657fcc Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
 Subject: [PATCH 28/33] usb: core: adjust log level for unauthorized devices
@@ -45,5 +45,5 @@ index 740342a2812a..2682bcf3e79f 100644
 		c = usb_choose_configuration(udev);
 		if (c >= 0) {
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From f0854d8c0544f803fe9a7b5309c957a565fc23fd Mon Sep 17 00:00:00 2001
+From f3a01b1b551eaf93cab827e882af6cb4a9baea93 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 May 2024 13:50:58 +0200
 Subject: [PATCH 29/33] net: dsa: mv88e6xxx: Grab register lock during counter
@@ -14,7 +14,7 @@ call site.
 1 file changed, 6 insertions(+), 4 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 6cff65788cc0..44c67c8278c8 100644
+index 58ba6af586a3..7f289ecda847 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1010,10 +1010,15 @@ static void mv88e6xxx_mac_link_up(struct dsa_switch *ds, int port,
@@ -46,5 +46,5 @@ index 6cff65788cc0..44c67c8278c8 100644
 	if (ret < 0)
 		return;
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From b86d945dfac27417d76758e9007a7278e0e104c9 Mon Sep 17 00:00:00 2001
+From 35678f05a08ec9cf6a04a6c5fd6929659cb1c6fc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 30/33] net: bridge: Differentiate MDB additions from
@@ -63,7 +63,7 @@ index 7305f5f8215c..a2882b126ecb 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 8fcd8faf99f3..7ba1eee1a024 100644
+index 919abce8b5ac..36f510b1f96c 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
@@ -618,7 +618,7 @@ static void br_multicast_fwd_src_handle(struct net_bridge_group_src *src)
@@ -84,7 +84,7 @@ index 8fcd8faf99f3..7ba1eee1a024 100644
 	}
 out:
 	spin_unlock(&br->multicast_lock);
-@@ -2888,7 +2888,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge_mcast *brmctx,
+@@ -2886,7 +2886,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge_mcast *brmctx,
 			break;
 		}
 		if (changed)
@@ -93,7 +93,7 @@ index 8fcd8faf99f3..7ba1eee1a024 100644
 unlock_continue:
 		spin_unlock(&brmctx->br->multicast_lock);
 	}
-@@ -3030,7 +3030,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge_mcast *brmctx,
+@@ -3028,7 +3028,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge_mcast *brmctx,
 			break;
 		}
 		if (changed)
@@ -103,5 +103,5 @@ index 8fcd8faf99f3..7ba1eee1a024 100644
 		spin_unlock(&brmctx->br->multicast_lock);
 	}
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 61575ec470a7ffc03aed8f1050b01f010ca65ade Mon Sep 17 00:00:00 2001
+From 1f574c5fedddd1e20c72617d619cc5c03c7ded51 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 31/33] net: dsa: tag_dsa: Use tag priority as initial
@@ -42,5 +42,5 @@ index 1fd7fa26db64..284bc65d1f63 100644
 }
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 53723010b587465f92fefeb4e5034aeb2d6d53ec Mon Sep 17 00:00:00 2001
+From 150f3585ab04373671a5741d2063dd25a8bc5bef Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 32/33] 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 44c67c8278c8..fbb0449a2176 100644
+index 7f289ecda847..0c6ab36a6905 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -31,6 +31,7 @@
@@ -41,7 +41,7 @@ index 44c67c8278c8..fbb0449a2176 100644
 
 #include "chip.h"
 #include "devlink.h"
-@@ -7101,6 +7102,68 @@ int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, u16 etype,
+@@ -7102,6 +7103,68 @@ int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, u16 etype,
 	return err;
 }
 
@@ -110,7 +110,7 @@ index 44c67c8278c8..fbb0449a2176 100644
 static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.get_tag_protocol	= mv88e6xxx_get_tag_protocol,
 	.change_tag_protocol	= mv88e6xxx_change_tag_protocol,
-@@ -7169,6 +7232,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -7170,6 +7233,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.crosschip_lag_leave	= mv88e6xxx_crosschip_lag_leave,
 	.port_add_etype_prio	= mv88e6xxx_port_add_etype_prio,
 	.port_del_etype_prio	= mv88e6xxx_port_del_etype_prio,
@@ -118,7 +118,7 @@ index 44c67c8278c8..fbb0449a2176 100644
 };
 
 static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
-@@ -7194,6 +7258,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
+@@ -7195,6 +7259,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
 	 */
 	ds->num_lag_ids = mv88e6xxx_has_lag(chip) ? 16 : 0;
 
@@ -156,5 +156,5 @@ index 284bc65d1f63..782cad614573 100644
 	}
 
 -- 
-2.34.1
+2.43.0

@@ -1,4 +1,4 @@
-From 0a256ae8eb81ce4464cf62a9e4eef0e5317062ac Mon Sep 17 00:00:00 2001
+From 38661fd37a2687911870776a186b5595211d3476 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 33/33] 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 fbb0449a2176..2e619fa102c4 100644
+index 0c6ab36a6905..305abb33b0c6 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3381,9 +3381,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
@@ -56,5 +56,5 @@ index fbb0449a2176..2e619fa102c4 100644
 	/* Forward any IPv4 IGMP or IPv6 MLD frames received
 	 * by a USER port to the CPU port to allow snooping.
 -- 
-2.34.1
+2.43.0