Merge pull request #1471 from kernelkit/kernel-upgrade-f52bac45-222b-4dda-86d4-50b617297422

2026-07-24 09:43:02 +02:00 · 2026-04-11 23:47:16 +02:00
parent fadffef6cd 5950e665ab
commit 1774e08219
55 changed files with 170 additions and 243 deletions
@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -8,7 +8,7 @@ All notable changes to the project are documented in this file.

 ### Changes

- Upgrade Linux kernel to 6.18.21 (LTS)
+- Upgrade Linux kernel to 6.18.22 (LTS)
 - Add support for [Banana Pi BPI-R4][BPI-R4], quad-core Cortex-A73 router with
  4x 2.5 GbE switching, dual 10 GbE SFP+.  Variants BPI-R4-2g5 and BPI-R4P have
  one SFP+ replaced by a 2.5 GbE RJ45, with optional PoE on the R4P
@@ -1,9 +1,8 @@
-From 657a79b59e67bac4af66f63bcf740238af399aba Mon Sep 17 00:00:00 2001
+From e9bd1bc3cafef4c1f0cb11ed8638eed50794d31a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 01/41] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 01/47] net: phy: marvell10g: Support firmware loading on
 88X3310
-Organization: Wires

 When probing, if a device is waiting for firmware to be loaded into
 its RAM, ask userspace for the binary and load it over XMDIO.
@@ -16,7 +15,7 @@ fall back.
 1 file changed, 161 insertions(+)

 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 8fd42131cdbf9..44294519231ed 100644
+index 8fd42131cdbf..44294519231e 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
@@ -25,6 +25,7 @@
@@ -1,9 +1,8 @@
-From 6684303b2262468f91f4aab0755a35f8dc2ee141 Mon Sep 17 00:00:00 2001
+From a438252db8621e406e2e3bfd82c4349820315bdf Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 02/41] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 02/47] net: phy: marvell10g: Fix power-up when strapped to
 start powered down
-Organization: Wires

 On devices which are hardware strapped to start powered down (PDSTATE
 == 1), make sure that we clear the power-down bit on all units
@@ -13,7 +12,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 44294519231ed..40439db49601d 100644
+index 44294519231e..40439db49601 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
@@ -322,11 +322,23 @@ static int mv3310_power_down(struct phy_device *phydev)
@@ -1,8 +1,7 @@
-From ee1464a4becdb06df87ae167fb56d9ac1530512f Mon Sep 17 00:00:00 2001
+From d0b9c6e92f1a037f380437cef703a6015c63826a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 03/41] net: phy: marvell10g: Add LED support for 88X3310
-Organization: Wires
+Subject: [PATCH 03/47] net: phy: marvell10g: Add LED support for 88X3310

 Pickup the LEDs from the state in which the hardware reset or
 bootloader left them, but also support further configuration via
@@ -22,7 +21,7 @@ Trigger support:
 1 file changed, 422 insertions(+)

 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 40439db49601d..7ae4744f147bb 100644
+index 40439db49601..7ae4744f147b 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
@@ -28,6 +28,7 @@
@@ -1,9 +1,8 @@
-From cfe0f07454be8ab659b33fafd83a57b2d44f2fdf Mon Sep 17 00:00:00 2001
+From 47c894a8311a88d6fd1169e8b4631bbb26dd5bbe Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 04/41] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 04/47] net: phy: marvell10g: Support LEDs tied to a single
 media side
-Organization: Wires

 In a combo-port setup, i.e. where both the copper and fiber interface
 are available to the user, the LEDs may be physically located either
@@ -19,7 +18,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 7ae4744f147bb..5e48355ffcef4 100644
+index 7ae4744f147b..5e48355ffcef 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
@@ -192,6 +192,9 @@ struct mv3310_chip {
@@ -1,8 +1,7 @@
-From e0d9221901b235ffb4c0ea58748e8e5263eb0d9f Mon Sep 17 00:00:00 2001
+From 31c4621b74153c7bd34b4f2bac34e55fb6edf6c3 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 05/41] net: phy: Do not resume PHY when attaching
-Organization: Wires
+Subject: [PATCH 05/47] net: phy: Do not resume PHY when attaching

 The PHY should not start negotiating with its link-partner until
 explicitly instructed to do so.
@@ -20,7 +19,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 2353d6eced68d..9b09834533933 100644
+index 2353d6eced68..9b0983453393 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
@@ -1750,7 +1750,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
@@ -1,9 +1,8 @@
-From 86cdec8b0959cf957b2811a23ddf77648161a402 Mon Sep 17 00:00:00 2001
+From f2dd7e7ad65122a04f2b7112f323985ea86497e1 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 06/41] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 06/47] net: bridge: avoid classifying unknown multicast as
 mrouters_only
-Organization: Wires

 Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
 the per-port mcast_flood setting, as well as to detected and configured
@@ -27,7 +26,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 7 files changed, 57 insertions(+), 14 deletions(-)

 diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
-index e52f8207ab278..306fa8a94c819 100644
+index e52f8207ab27..306fa8a94c81 100644
 --- a/include/uapi/linux/if_bridge.h
 +++ b/include/uapi/linux/if_bridge.h
@@ -835,6 +835,7 @@ enum br_boolopt_id {
@@ -39,7 +38,7 @@ index e52f8207ab278..306fa8a94c819 100644
 };
 
 diff --git a/net/bridge/br.c b/net/bridge/br.c
-index c37e52e2f29ad..0759bc37d6f0f 100644
+index c37e52e2f29a..0759bc37d6f0 100644
 --- a/net/bridge/br.c
 +++ b/net/bridge/br.c
@@ -312,6 +312,9 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,
@@ -62,7 +61,7 @@ index c37e52e2f29ad..0759bc37d6f0f 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 525d4eccd194a..6278dfc9612f5 100644
+index 525d4eccd194..6278dfc9612f 100644
 --- a/net/bridge/br_device.c
 +++ b/net/bridge/br_device.c
@@ -89,10 +89,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -102,7 +101,7 @@ index 525d4eccd194a..6278dfc9612f5 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 dea09096ad0fb..f0a613238e0d5 100644
+index dea09096ad0f..f0a613238e0d 100644
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
@@ -199,15 +199,20 @@ static struct net_bridge_port *maybe_deliver(
@@ -141,7 +140,7 @@ index dea09096ad0fb..f0a613238e0d5 100644
 				continue;
 			break;
 diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index 2cbae0f9ae1f0..0c539bf4bebec 100644
+index 2cbae0f9ae1f..0c539bf4bebe 100644
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
@@ -186,9 +186,13 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
@@ -171,7 +170,7 @@ index 2cbae0f9ae1f0..0c539bf4bebec 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 5855eb0502085..06641afb99a8b 100644
+index 5855eb050208..06641afb99a8 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
@@ -3836,6 +3836,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
@@ -207,7 +206,7 @@ index 5855eb0502085..06641afb99a8b 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 b9b2981c48414..ccbaaa96f7c70 100644
+index b9b2981c4841..ccbaaa96f7c7 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
@@ -489,6 +489,7 @@ enum net_bridge_opts {
@@ -1,9 +1,8 @@
-From 31794e03e7f1d66f7fdff708cdaa40453e591204 Mon Sep 17 00:00:00 2001
+From 4ba1828608aa40cd030c754db94288ec7adff1e6 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 07/41] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 07/47] net: bridge: Ignore router ports when forwarding L2
 multicast
-Organization: Wires

 Multicast router ports are either statically configured or learned from
 control protocol traffic (IGMP/MLD/PIM).  These protocols regulate IP
@@ -17,7 +16,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index ccbaaa96f7c70..d7187bead4968 100644
+index ccbaaa96f7c7..d7187bead496 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
@@ -1097,7 +1097,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
@@ -1,9 +1,8 @@
-From 984d59e5f06c3741e1c76daf4bed6883eb339e97 Mon Sep 17 00:00:00 2001
+From 1f0b4879fcd6cdde6759b8727940023bb9280768 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 08/41] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 08/47] net: bridge: drop delay for applying strict multicast
 filtering
-Organization: Wires

 This *local* patch drops the initial delay before applying strict multicast
 filtering, introduced in [1] and recently updated in [2].
@@ -25,7 +24,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 06641afb99a8b..bacff6c2e9684 100644
+index 06641afb99a8..bacff6c2e968 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
@@ -1760,10 +1760,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
@@ -164,7 +163,7 @@ index 06641afb99a8b..bacff6c2e9684 100644
 #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index d7187bead4968..83dc15fdcefdc 100644
+index d7187bead496..83dc15fdcefd 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
@@ -80,7 +80,6 @@ struct bridge_mcast_own_query {
@@ -1,9 +1,8 @@
-From e3f31e30e7086bdd0b9698deb0b036d5e8ebb99e Mon Sep 17 00:00:00 2001
+From 5cf9d6e2ce6e3b9ad031b25fa6af8f36b2738890 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
-Subject: [PATCH 09/41] net: bridge: Differentiate MDB additions from
+Subject: [PATCH 09/47] net: bridge: Differentiate MDB additions from
 modifications
-Organization: Wires

 Before this change, the reception of an IGMPv3 report (and analogously
 for MLDv2) that adds a new group, would trigger two MDB RTM_NEWMDB
@@ -28,7 +27,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 dab9493c791b8..40a3534f0f1d7 100644
+index dab9493c791b..40a3534f0f1d 100644
 --- a/include/uapi/linux/rtnetlink.h
 +++ b/include/uapi/linux/rtnetlink.h
@@ -142,6 +142,8 @@ enum {
@@ -41,7 +40,7 @@ index dab9493c791b8..40a3534f0f1d7 100644
 	RTM_NEWNSID = 88,
 #define RTM_NEWNSID RTM_NEWNSID
 diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
-index 400eb872b4032..cd7a2cd0911ad 100644
+index 400eb872b403..cd7a2cd0911a 100644
 --- a/net/bridge/br_mdb.c
 +++ b/net/bridge/br_mdb.c
@@ -752,7 +752,7 @@ static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
@@ -63,7 +62,7 @@ index 400eb872b4032..cd7a2cd0911ad 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 bacff6c2e9684..a5f3e4935edc6 100644
+index bacff6c2e968..a5f3e4935edc 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
@@ -616,7 +616,7 @@ static void br_multicast_fwd_src_handle(struct net_bridge_group_src *src)
@@ -1,9 +1,8 @@
-From 7f1e44c7216953f3b09e2aa6df4c739ce2e1d480 Mon Sep 17 00:00:00 2001
+From f1470c4f8c8fb850e93ccbd1a976516687b0c577 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
-Subject: [PATCH 10/41] nvmem: layouts: onie-tlv: Let device probe even when
+Subject: [PATCH 10/47] nvmem: layouts: onie-tlv: Let device probe even when
 TLV is invalid
-Organization: Wires

 Before this change, probing an NVMEM device, expected to contain a
 valid TLV, would fail if it had not been provisioned yet. But an
@@ -18,7 +17,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)
@@ -1,9 +1,8 @@
-From 080f229c35d686e8c260092e18caa39cbe833392 Mon Sep 17 00:00:00 2001
+From eb2378276d37344a2d5271abeddcebc0b34f6256 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
-Subject: [PATCH 11/41] net: usb: r8152: add r8153b support for link/activity
+Subject: [PATCH 11/47] net: usb: r8152: add r8153b support for link/activity
 LEDs
-Organization: Wires

 This patch adds support for the link/activity LEDs on the NanoPi R2S
 and OrangePi R1 Plus.
@@ -19,7 +18,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 8 insertions(+)

 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 357f5c733d0b5..e7aa0cffadc58 100644
+index 357f5c733d0b..e7aa0cffadc5 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
@@ -41,6 +41,11 @@
@@ -1,9 +1,8 @@
-From 2040cffd47b80aa352b624ddaa66f47f85d5c88a Mon Sep 17 00:00:00 2001
+From a370be1eabe3c6dd9e34e74a8224481489d82811 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 10 Aug 2025 18:52:54 +0200
-Subject: [PATCH 12/41] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to
+Subject: [PATCH 12/47] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to
 match case
-Organization: Wires

 For ref. see: https://wiki.banana-pi.org/File:Bpi-r3_Metal_case.jpg

@@ -16,7 +15,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 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 e7654dc9a1c9b..4cc6aff072256 100644
+index e7654dc9a1c9..4cc6aff07225 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 {
@@ -1,9 +1,8 @@
-From db4b35cf2ce8f06e9ed65b394728e846f92af4b7 Mon Sep 17 00:00:00 2001
+From 5338a451b60eceeffa1be9ef4b5ac3b2991386b9 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 20 Aug 2025 21:38:24 +0200
-Subject: [PATCH 13/41] drm/panel-simple: Add a timing for the Raspberry Pi 7"
+Subject: [PATCH 13/47] drm/panel-simple: Add a timing for the Raspberry Pi 7"
 panel
-Organization: Wires

 The Raspberry Pi 7" 800x480 panel uses a Toshiba TC358762 DSI
 to DPI bridge chip, so there is a requirement for the timings
@@ -47,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 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 271f933991937..75dbc3cb81354 100644
+index 271f93399193..75dbc3cb8135 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -400,7 +400,8 @@ static int panel_simple_get_modes(struct drm_panel *panel,
@@ -1,8 +1,7 @@
-From c6bdd72407392acd6f29e6a1554724953ec8590f Mon Sep 17 00:00:00 2001
+From d667d09e34c06d33f92e9e0272adb220b48e5a87 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 21 Aug 2025 11:20:23 +0200
-Subject: [PATCH 14/41] input:touchscreen:edt-ft5x06: Add polled mode
-Organization: Wires
+Subject: [PATCH 14/47] input:touchscreen:edt-ft5x06: Add polled mode

 Not all hardware has interrupts therefore we need
 to poll the touchscreen.
@@ -11,7 +10,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 bf498bd4dea96..30308d8409353 100644
+index bf498bd4dea9..30308d840935 100644
 --- a/drivers/input/touchscreen/edt-ft5x06.c
 +++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -77,6 +77,9 @@
@@ -1,9 +1,8 @@
-From 0361723f9ea674aab4e76f4a88471c1719976623 Mon Sep 17 00:00:00 2001
+From 400b8ee866ed8dbc371eb9c39bb5af688bf614e2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
-Subject: [PATCH 15/41] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
+Subject: [PATCH 15/47] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
 PPU on 6393X
-Organization: Wires

 In a multi-chip setup, delays of up to 750ms are observed before the
 device (6393X) signals completion of PPU initialization (Global 1,
@@ -13,7 +12,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 09002c853b78e..22f4fe642578c 100644
+index 09002c853b78..22f4fe642578 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)
@@ -1,9 +1,8 @@
-From d9cc0e3a04dec8b02edbb0510eaee73734e9fe1b Mon Sep 17 00:00:00 2001
+From e94480f3fdf58c1bd358ab4f52cf49d36f863e13 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
-Subject: [PATCH 16/41] net: dsa: mv88e6xxx: Improve indirect register access
+Subject: [PATCH 16/47] net: dsa: mv88e6xxx: Improve indirect register access
 perf on 6393
-Organization: Wires

 When operating in multi-chip mode, the 6393 family maps a subset of
 commonly used global registers to the outermost address space (in
@@ -22,7 +21,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 22f4fe642578c..c51588e74aedb 100644
+index 22f4fe642578..c51588e74aed 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6543,6 +6543,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
@@ -40,7 +39,7 @@ index 22f4fe642578c..c51588e74aedb 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 +53,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 +67,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 +168,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 @@
@@ -1,9 +1,8 @@
-From 8516fa6ca5c60461f61703525eb29efc2f90e83f Mon Sep 17 00:00:00 2001
+From 40153140fc62e5f392ae82b05eea5d0055d24c20 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
-Subject: [PATCH 17/41] net: dsa: mv88e6xxx: Honor ports being managed via
+Subject: [PATCH 17/47] net: dsa: mv88e6xxx: Honor ports being managed via
 in-band-status
-Organization: Wires

 Keep all link parameters in their unforced states when the port is
 declared as being managed via in-band-status, and let the MAC
@@ -18,7 +17,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 c51588e74aedb..de230df48545d 100644
+index c51588e74aed..de230df48545 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -965,6 +965,9 @@ static void mv88e6xxx_mac_link_down(struct phylink_config *config,
@@ -1,9 +1,8 @@
-From 46f0ce2051d0ddb753a663b5bc2a622758100899 Mon Sep 17 00:00:00 2001
+From 65179be5219f6ed4b7aa69514039a0780b69fd71 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
-Subject: [PATCH 18/41] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
+Subject: [PATCH 18/47] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
 ports on 6393X
-Organization: Wires

 For packets with a DA in the IEEE reserved L2 group range, originating
 from a CPU, forward it as normal, rather than classifying it as
@@ -34,7 +33,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 66b1b72772810..df19dfa5cc3d8 100644
+index 66b1b7277281..df19dfa5cc3d 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.c
 +++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -1434,6 +1434,23 @@ static int mv88e6393x_port_policy_write_all(struct mv88e6xxx_chip *chip,
@@ -1,9 +1,8 @@
-From 07600da9729116e9d146a961a681312fd5945831 Mon Sep 17 00:00:00 2001
+From 5baf37feaeebce010981a299a049a85da048e2bf Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
-Subject: [PATCH 19/41] net: dsa: tag_dsa: Use tag priority as initial
+Subject: [PATCH 19/47] net: dsa: tag_dsa: Use tag priority as initial
 skb->priority
-Organization: Wires

 Use the 3-bit priority field from the DSA tag as the initial packet
 priority on ingress to the CPU.
@@ -24,7 +23,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,
@@ -1,9 +1,8 @@
-From 3d7009324b7b0855621b1187cdd02f5cd1d10aae Mon Sep 17 00:00:00 2001
+From eb86880e1ecf9af3b33c0d300d59ac604e03fb69 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
-Subject: [PATCH 20/41] net: dsa: Support MDB memberships whose L2 addresses
+Subject: [PATCH 20/47] net: dsa: Support MDB memberships whose L2 addresses
 overlap
-Organization: Wires

 Multiple IP multicast groups (32 for v4, 2^80 for v6) map to the same
 L2 address. This means that switchdev drivers may receive multiple MDB
@@ -34,7 +33,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,
@@ -1,8 +1,7 @@
-From 3f046855852e41283e4855575974f376c4d82976 Mon Sep 17 00:00:00 2001
+From 5017e8873b9d3116e180e3a57ece3aa8b0a86677 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
-Subject: [PATCH 21/41] net: dsa: Support EtherType based priority overrides
-Organization: Wires
+Subject: [PATCH 21/47] net: dsa: Support EtherType based priority overrides

 ---
 include/net/dsa.h |  4 ++++
@@ -10,7 +9,7 @@ Organization: Wires
 2 files changed, 58 insertions(+), 2 deletions(-)

 diff --git a/include/net/dsa.h b/include/net/dsa.h
-index 5cb456bf46394..c31d4e910f075 100644
+index 5cb456bf4639..c31d4e910f07 100644
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
@@ -958,6 +958,10 @@ struct dsa_switch_ops {
@@ -25,7 +24,7 @@ index 5cb456bf46394..c31d4e910f075 100644
 	/*
 	 * Suspend and resume
 diff --git a/net/dsa/user.c b/net/dsa/user.c
-index f59d66f0975d7..58174ad612d21 100644
+index f59d66f0975d..58174ad612d2 100644
 --- a/net/dsa/user.c
 +++ b/net/dsa/user.c
@@ -2336,6 +2336,34 @@ dsa_user_dcbnl_add_dscp_prio(struct net_device *dev, struct dcb_app *app)
@@ -1,9 +1,8 @@
-From ab5c530c7dbf9f8dacf42231d4aa8331ae874c00 Mon Sep 17 00:00:00 2001
+From 8dee19e065a9568c46249cd7c10c23e9437e83aa Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
-Subject: [PATCH 22/41] net: dsa: mv88e6xxx: Support EtherType based priority
+Subject: [PATCH 22/47] net: dsa: mv88e6xxx: Support EtherType based priority
 overrides
-Organization: Wires

 ---
 drivers/net/dsa/mv88e6xxx/chip.c    | 64 +++++++++++++++++++++++++++++
@@ -15,7 +14,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 de230df48545d..c99aef8afa5d0 100644
+index de230df48545..c99aef8afa5d 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1688,6 +1688,11 @@ static int mv88e6xxx_rmu_setup(struct mv88e6xxx_chip *chip)
@@ -118,7 +117,7 @@ index de230df48545d..c99aef8afa5d0 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 e073446ee7d02..5d5e7ab63fca3 100644
+index e073446ee7d0..5d5e7ab63fca 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.h
 +++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -301,6 +301,11 @@ struct mv88e6xxx_port {
@@ -171,7 +170,7 @@ index e073446ee7d02..5d5e7ab63fca3 100644
 
 struct mv88e6xxx_bus_ops {
 diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c
-index 30a6ffa7817b0..3f16a7ef3fa28 100644
+index 30a6ffa7817b..3f16a7ef3fa2 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 +244,7 @@ index 30a6ffa7817b0..3f16a7ef3fa28 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 +266,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 df19dfa5cc3d8..e1fee09eae2fc 100644
+index df19dfa5cc3d..e1fee09eae2f 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.c
 +++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -1560,6 +1560,52 @@ int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,
@@ -324,7 +323,7 @@ index df19dfa5cc3d8..e1fee09eae2fc 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 c1d2f99efb1c6..d2ba9ed1f23ea 100644
+index c1d2f99efb1c..d2ba9ed1f23e 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.h
 +++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -286,7 +286,18 @@
@@ -1,8 +1,7 @@
-From 1a2c045f9e4fd595803b014bd85e2914b9003e8d Mon Sep 17 00:00:00 2001
+From a98d626f9419e2c6e21f513b7f69a46979f33c81 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
-Subject: [PATCH 23/41] net: dsa: mv88e6xxx: Add mqprio qdisc support
-Organization: Wires
+Subject: [PATCH 23/47] net: dsa: mv88e6xxx: Add mqprio qdisc support

 Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
 the packet's traffic class as the outgoing priority when no PCP bits
@@ -30,7 +29,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 c99aef8afa5d0..2c533aeb7374d 100644
+index c99aef8afa5d..2c533aeb7374 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -32,6 +32,7 @@
@@ -132,7 +131,7 @@ index c99aef8afa5d0..2c533aeb7374d 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,
@@ -1,9 +1,8 @@
-From e21110ff341e8e98fd37682eb3697af164ab6a18 Mon Sep 17 00:00:00 2001
+From 4145d69ac6c6f7a2a517b826cfd8dd41358b9b85 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
-Subject: [PATCH 24/41] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
+Subject: [PATCH 24/47] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
 are available
-Organization: Wires

 Switch the priority sourcing precdence to prefer VLAN PCP over IP
 DSCP, when both are available.
@@ -27,7 +26,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 2c533aeb7374d..969f772fcb273 100644
+index 2c533aeb7374..969f772fcb27 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3422,9 +3422,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
@@ -1,9 +1,8 @@
-From 707470adc86e9a099e3660c1c6c7a50ec38c2aa9 Mon Sep 17 00:00:00 2001
+From a379ba9057d9a2396b8f58d9e23113579a83b383 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
-Subject: [PATCH 25/41] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
+Subject: [PATCH 25/47] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
 VLANs
-Organization: Wires

 Before this change, in a setup like the following, packets assigned to
 VLAN 10 were forwarded between the switch ports, even though the
@@ -31,7 +30,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 969f772fcb273..161ce87a88716 100644
+index 969f772fcb27..161ce87a8871 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2611,7 +2611,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port,
@@ -118,7 +117,7 @@ index 969f772fcb273..161ce87a88716 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 +132,7 @@ index 8346b0d29542c..764cd3dd46454 100644
 
 #define SWITCHDEV_OBJ_PORT_VLAN(OBJ) \
 diff --git a/net/dsa/user.c b/net/dsa/user.c
-index 58174ad612d21..c0019d0c1172d 100644
+index 58174ad612d2..c0019d0c1172 100644
 --- a/net/dsa/user.c
 +++ b/net/dsa/user.c
@@ -1796,6 +1796,8 @@ static int dsa_user_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
@@ -1,9 +1,8 @@
-From 810739b589e9a754a62f2070abf39bab7c96122d Mon Sep 17 00:00:00 2001
+From 075242de1f0f768dfc4340fe286d26354ea74f84 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
-Subject: [PATCH 26/41] net: dsa: mv88e6xxx: collapse disabled state into
+Subject: [PATCH 26/47] net: dsa: mv88e6xxx: collapse disabled state into
 blocking
-Organization: Wires

 This patch changes the behavior of switchcore ports wrt. the port state.
 Instead of disabling the port, the driver now treats the disabled state
@@ -23,7 +22,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 2 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
-index e1fee09eae2fc..e28fdd21de38e 100644
+index e1fee09eae2f..e28fdd21de38 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.c
 +++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -793,8 +793,6 @@ int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state)
@@ -1,9 +1,8 @@
-From 33439041b14ff724f0d607df9bf46ae90415f493 Mon Sep 17 00:00:00 2001
+From 41f390aa23512a696dd32a4ca5b9fb18da52d6ca Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
-Subject: [PATCH 27/41] net: dsa: mv88e6xxx: Only activate LAG offloading when
+Subject: [PATCH 27/47] net: dsa: mv88e6xxx: Only activate LAG offloading when
 bridged
-Organization: Wires

 The current port isolation scheme for mv88e6xxx is detailed here:
 https://lore.kernel.org/netdev/20220203101657.990241-1-tobias@waldekranz.com/
@@ -51,7 +50,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 161ce87a88716..d379799c0a168 100644
+index 161ce87a8871..d379799c0a16 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3058,6 +3058,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
@@ -1,8 +1,7 @@
-From 1c589a1949419a0f810a768f0d871d849c48073c Mon Sep 17 00:00:00 2001
+From c434f15e57c7788e0895b7196a3251685dc550f8 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 14 Jan 2026 18:22:41 +0100
-Subject: [PATCH 28/41] net: dsa: mv88e6xxx: Add LED support for 6393X
-Organization: Wires
+Subject: [PATCH 28/47] net: dsa: mv88e6xxx: Add LED support for 6393X

 Original commit:
 commit 462277b926140ee2d231317e92afb6cabf640268
@@ -23,7 +22,7 @@ Date:   Thu Nov 16 21:59:35 2023 +0100
 4 files changed, 450 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index d379799c0a168..7bc3169839d3b 100644
+index d379799c0a16..7bc3169839d3 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5658,6 +5658,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
@@ -35,7 +34,7 @@ index d379799c0a168..7bc3169839d3b 100644
 	.port_set_upstream_port = mv88e6393x_port_set_upstream_port,
 	.stats_snapshot = mv88e6390_g1_stats_snapshot,
 diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c
-index ab3bc645da566..aa539df21f8d7 100644
+index ab3bc645da56..aa539df21f8d 100644
 --- a/drivers/net/dsa/mv88e6xxx/leds.c
 +++ b/drivers/net/dsa/mv88e6xxx/leds.c
@@ -102,6 +102,58 @@ struct mv88e6xxx_led_hwconfig {
@@ -453,7 +452,7 @@ index ab3bc645da566..aa539df21f8d7 100644
 +	return ret;
 +}
 diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
-index e28fdd21de38e..1985b85536112 100644
+index e28fdd21de38..1985b8553611 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.c
 +++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -1604,6 +1604,39 @@ int mv88e6xxx_port_relinquish_ether_type(struct mv88e6xxx_chip *chip, int port)
@@ -497,7 +496,7 @@ index e28fdd21de38e..1985b85536112 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 d2ba9ed1f23ea..f4a56671fc4c2 100644
+index d2ba9ed1f23e..f4a56671fc4c 100644
 --- a/drivers/net/dsa/mv88e6xxx/port.h
 +++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -444,6 +444,9 @@
@@ -1,12 +1,11 @@
-From bc38784c6cece06ea7de222187024eade94d6cbd Mon Sep 17 00:00:00 2001
+From b42e3b5884a87bb7adf437b88b12e9ab00369aa2 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 15 Jan 2026 22:47:37 +0100
-Subject: [PATCH 29/41] wifi: brcmfmac: support deletion and recreation of
+Subject: [PATCH 29/47] wifi: brcmfmac: support deletion and recreation of
 primary interface
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 The Broadcom FullMAC firmware does not allow the primary interface
 (bsscfgidx 0) to be deleted - it always exists in firmware. However,
@@ -45,7 +44,7 @@ Signed-off-by: Mattias Walström <lazzer@gmail.com>
 4 files changed, 186 insertions(+), 20 deletions(-)

 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index bb96b87b2a6e5..bcd8a4724625b 100644
+index bb96b87b2a6e..bcd8a4724625 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -124,6 +124,9 @@ struct cca_msrmnt_query {
@@ -333,7 +332,7 @@ index bb96b87b2a6e5..bcd8a4724625b 100644
 	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PHY_NOISE, &noise);
 	if (err) {
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
-index 273c80f2d483a..ee7e9dc17dce0 100644
+index 273c80f2d483..ee7e9dc17dce 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -433,7 +433,9 @@ static inline struct brcmf_cfg80211_vif *wdev_to_vif(struct wireless_dev *wdev)
@@ -348,7 +347,7 @@ index 273c80f2d483a..ee7e9dc17dce0 100644
 
 static inline struct brcmf_cfg80211_info *ndev_to_cfg(struct net_device *ndev)
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-index 862a0336a0b59..08f265325ce41 100644
+index 862a0336a0b5..08f265325ce4 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -933,9 +933,11 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,
@@ -366,7 +365,7 @@ index 862a0336a0b59..08f265325ce41 100644
 		} else {
 			netif_stop_queue(ifp->ndev);
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-index e1752a513c733..2dc0fbba271de 100644
+index e1752a513c73..2dc0fbba271d 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -2222,8 +2222,13 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
@@ -1,12 +1,11 @@
-From 1b42e2f4929b011f0e0d7c8ec552970164811a98 Mon Sep 17 00:00:00 2001
+From 4729d6d899318450930cc768c904df03ca9b365c Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Mon, 19 Jan 2026 13:06:53 +0100
-Subject: [PATCH 30/41] wifi: brcmfmac: check connection state before querying
+Subject: [PATCH 30/47] wifi: brcmfmac: check connection state before querying
 station info
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 In station mode, brcmf_cfg80211_get_station() queries the firmware for
 station info even when not connected to an AP. This results in error
@@ -24,7 +23,7 @@ Signed-off-by: Mattias Walström <lazzer@gmail.com>
 1 file changed, 5 insertions(+)

 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index bcd8a4724625b..f06658d4299b3 100644
+index bcd8a4724625..f06658d4299b 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3303,6 +3303,11 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
@@ -1,12 +1,11 @@
-From 8de957dbd9fcb775b3fa27a0d396fd6f95aa9da8 Mon Sep 17 00:00:00 2001
+From 60e1e211b5dd946bd0f829ab6672e60d8674c95d Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:12:10 +0100
-Subject: [PATCH 31/41] wifi: brcmfmac: suppress log spam for
+Subject: [PATCH 31/47] wifi: brcmfmac: suppress log spam for
 regulatory-restricted channels
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 When scanning, the driver attempts to set each channel and logs an
 error if the firmware rejects it. For regulatory-restricted channels,
@@ -21,7 +20,7 @@ Signed-off-by: Mattias Walström <lazzer@gmail.com>
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index f06658d4299b3..046e07875d001 100644
+index f06658d4299b..046e07875d00 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -8283,7 +8283,12 @@ brcmf_set_channel(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
@@ -1,12 +1,11 @@
-From 0a25079b3ae16423aaad78637ed6fc29b44283d9 Mon Sep 17 00:00:00 2001
+From afeb52b56fe9b009d13feb7759ff8d449122bc13 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:18:45 +0100
-Subject: [PATCH 32/41] wifi: brcmfmac: reduce log noise during AP to station
+Subject: [PATCH 32/47] wifi: brcmfmac: reduce log noise during AP to station
 transition
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 When transitioning from AP mode to station mode (e.g., hostapd stopping
 and wpa_supplicant starting), several non-fatal errors can occur:
@@ -28,7 +27,7 @@ Signed-off-by: Mattias Walström <lazzer@gmail.com>
 1 file changed, 9 insertions(+), 4 deletions(-)

 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index 046e07875d001..0b04f98f6e4ee 100644
+index 046e07875d00..0b04f98f6e4e 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1130,13 +1130,15 @@ static void brcmf_scan_config_mpc(struct brcmf_if *ifp, int mpc)
@@ -1,9 +1,8 @@
-From 81cb8dc071332896b5d3c49f6edd8b8331b86f2f Mon Sep 17 00:00:00 2001
+From 1966cd2804cf32c49d909731495e4d045413a805 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 17 Feb 2026 21:59:59 +0100
-Subject: [PATCH 33/41] net: phy: air_en8811h: add OF device table for
+Subject: [PATCH 33/47] net: phy: air_en8811h: add OF device table for
 auto-loading
-Organization: Wires

 mdio_uevent() only emits an OF-style MODALIAS via
 of_device_uevent_modalias(), never the mdio: binary format that
@@ -21,7 +20,7 @@ rejects drivers that provide an of_match_table.
 1 file changed, 6 insertions(+)

 diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c
-index badd65f0ccee2..b609465247a28 100644
+index badd65f0ccee..b609465247a2 100644
 --- a/drivers/net/phy/air_en8811h.c
 +++ b/drivers/net/phy/air_en8811h.c
@@ -1184,6 +1184,12 @@ static int en8811h_suspend(struct phy_device *phydev)
@@ -1,9 +1,8 @@
-From 42de6ed86d2d6745c0a96515c5d39d29eb5a6695 Mon Sep 17 00:00:00 2001
+From 1334bb5c92403aa569818dbe4f30a8f6672f4427 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 20 Sep 2024 12:05:18 +0100
-Subject: [PATCH 34/41] drm: vc4: dsi: enable video and then retry failed
+Subject: [PATCH 34/47] drm: vc4: dsi: enable video and then retry failed
 transfers
-Organization: Wires

 The DSI block appears to be able to come up stuck in a condition where
 it leaves the lanes in HS mode or just jabbering. This stops LP
@@ -19,7 +18,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 46 insertions(+), 8 deletions(-)

 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index 458e5d9879645..439d7a04127d8 100644
+index 458e5d987964..439d7a04127d 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -286,6 +286,8 @@
@@ -1,8 +1,7 @@
-From d7727e571a36e978685cc5457d69ee12bab5b95e Mon Sep 17 00:00:00 2001
+From 4a7d0f8869547af498a30a54abc9e2effd23464d Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Jun 2022 17:23:47 +0100
-Subject: [PATCH 35/41] drm: vc4: dsi: Clocks should be running before reset
-Organization: Wires
+Subject: [PATCH 35/47] drm: vc4: dsi: Clocks should be running before reset

 The initialisation sequence differs slightly from the documentation
 in that the clocks are meant to be running before resets and
@@ -14,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 15 insertions(+), 15 deletions(-)

 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index 439d7a04127d8..1eba498d276f8 100644
+index 439d7a04127d..1eba498d276f 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -926,6 +926,21 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
@@ -1,8 +1,7 @@
-From ee825e39fc6d6d40a51bcf6de7fe3c553aa44c60 Mon Sep 17 00:00:00 2001
+From 5c26594b9eb1b82b631ae9ae180df8598c46f003 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 5 Apr 2024 17:51:55 +0100
-Subject: [PATCH 36/41] drm/vc4: Ensure DSI is enabled for FIFO resets
-Organization: Wires
+Subject: [PATCH 36/47] drm/vc4: Ensure DSI is enabled for FIFO resets

 The block must be enabled for the FIFO resets to be actioned,
 so ensure this is the case.
@@ -13,7 +12,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index 1eba498d276f8..de963edefb760 100644
+index 1eba498d276f..de963edefb76 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -400,7 +400,8 @@
@@ -1,8 +1,7 @@
-From 72f90bf20790266571c167e5f9d4348f3f3a6815 Mon Sep 17 00:00:00 2001
+From 90285e557effd004f507aae7659c9a5fd94bfd7e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 26 May 2022 18:56:19 +0100
-Subject: [PATCH 37/41] drm: vc4: Reset DSI AFE on disable
-Organization: Wires
+Subject: [PATCH 37/47] drm: vc4: Reset DSI AFE on disable

 vc4_dsi_bridge_disable wasn't resetting things during shutdown,
 so add that in.
@@ -13,7 +12,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 20 insertions(+)

 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index de963edefb760..9756821ebf27c 100644
+index de963edefb76..9756821ebf27 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -360,6 +360,16 @@
@@ -1,8 +1,7 @@
-From e92eb94594b1e04b69c5c85f0719d09c8858cdfe Mon Sep 17 00:00:00 2001
+From 7547a9a0fd1fc55456e451b00637a5c59a8291ad Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 20 Nov 2024 13:58:08 +0000
-Subject: [PATCH 38/41] drm: vc4: dsi: Handle the different command FIFO widths
-Organization: Wires
+Subject: [PATCH 38/47] drm: vc4: dsi: Handle the different command FIFO widths

 DSI0 and DSI1 have different widths for the command FIFO (24bit
 vs 32bit), but the driver was assuming the 32bit width of DSI1
@@ -18,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 44 insertions(+), 20 deletions(-)

 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index 9756821ebf27c..b1cc30b8aa797 100644
+index 9756821ebf27..b1cc30b8aa79 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -44,7 +44,6 @@
@@ -1,9 +1,8 @@
-From 9975a8fd3fb000644606269a4e13a62f5b43180a Mon Sep 17 00:00:00 2001
+From 2ce08de6d1c34e5edc632ae3d7989bf532bf9674 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 17:37:00 +0000
-Subject: [PATCH 39/41] drm/bridge: tc358762: Program the DPI mode into the
+Subject: [PATCH 39/47] drm/bridge: tc358762: Program the DPI mode into the
 chip
-Organization: Wires

 The autodetection of resolution/timing by the TC358762 can lead
 to the display being shifted by a pixel or two.
@@ -17,7 +16,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 15 insertions(+)

 diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c
-index 98df3e667d4aa..73b169026e63b 100644
+index 98df3e667d4a..73b169026e63 100644
 --- a/drivers/gpu/drm/bridge/tc358762.c
 +++ b/drivers/gpu/drm/bridge/tc358762.c
@@ -53,6 +53,12 @@
@@ -1,8 +1,7 @@
-From 469cee798fdbcde99cd78ac7fc6d8ab61902d806 Mon Sep 17 00:00:00 2001
+From 3ff89dddb0f78beac41660b95bd510c81698c378 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 9 Jan 2024 18:44:49 +0000
-Subject: [PATCH 40/41] drm/bridge: tc358762: revert move ops to enable
-Organization: Wires
+Subject: [PATCH 40/47] drm/bridge: tc358762: revert move ops to enable

 Reverts 8a4b2fc9c91a ("drm/bridge: tc358762: Split register programming from pre-enable to enable")
 as we want the config commands sent before video starts.
@@ -13,7 +12,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 1 file changed, 10 deletions(-)

 diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c
-index 73b169026e63b..6164932edfec9 100644
+index 73b169026e63..6164932edfec 100644
 --- a/drivers/gpu/drm/bridge/tc358762.c
 +++ b/drivers/gpu/drm/bridge/tc358762.c
@@ -202,15 +202,6 @@ static void tc358762_pre_enable(struct drm_bridge *bridge,
@@ -1,12 +1,11 @@
-From 3d1db425ec44e6c885e7b83d5a53b48b235aaa2f Mon Sep 17 00:00:00 2001
+From 89f40a8ef48727a91f38673db8f99ae1fa58940b Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Sat, 4 Apr 2026 18:04:19 +0200
-Subject: [PATCH 41/41] drm/bridge: tc358762: Set pre_enabled on pre_enable to
+Subject: [PATCH 41/47] drm/bridge: tc358762: Set pre_enabled on pre_enable to
 prevent regulator imbalance
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 The RPi cherry-pick moved tc358762_init() to pre_enable but dropped the pre_enabled = true assignment.
 Without it, post_disable always bails out early and never disables the regulator.
@@ -17,7 +16,7 @@ Signed-off-by: Mattias Walström <lazzer@gmail.com>
 1 file changed, 2 insertions(+)

 diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c
-index 6164932edfec9..8da66b06d6b63 100644
+index 6164932edfec..8da66b06d6b6 100644
 --- a/drivers/gpu/drm/bridge/tc358762.c
 +++ b/drivers/gpu/drm/bridge/tc358762.c
@@ -205,6 +205,8 @@ static void tc358762_pre_enable(struct drm_bridge *bridge,
@@ -1,8 +1,7 @@
-From 8d2aec5525d60e643f85d68d62186cae530f17fc Mon Sep 17 00:00:00 2001
+From 8238dba566d274afd0d2a644ba9019c51da043dc Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 5 Apr 2026 11:33:00 +0200
 Subject: [PATCH 42/47] net/pcs: add standalone PCS registration infrastructure
-Organization: Wires

 Add a simple registration mechanism that allows platform PCS drivers to
 register their phylink_pcs instances, and consumers (e.g. Ethernet MAC
@@ -13,8 +12,6 @@ registered, devm_of_pcs_get() returns -ENODEV to trigger deferred probe
 in the consumer driver.

 Based on work by Daniel Golle <daniel@makrotopia.org>.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/pcs/Kconfig            |  4 ++
 drivers/net/pcs/Makefile           |  1 +
@@ -184,6 +181,3 @@ index 000000000000..520835cdeee8
 +}
 +#endif /* CONFIG_PCS_STANDALONE */
 +#endif /* __LINUX_PCS_STANDALONE_H */
-- 
-2.43.0
-
@@ -1,8 +1,7 @@
-From a11a254420cf8777497b7c027208b382c49964e7 Mon Sep 17 00:00:00 2001
+From b4b1e9dcd961292fdfc5107093a9bd0bbbb1aeee Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:14:23 +0200
 Subject: [PATCH 43/47] net/pcs: add MediaTek MT7988 USXGMII PCS driver
-Organization: Wires

 Add a PCS driver for the USXGMII subsystem found in the MediaTek MT7988
 SoC (usxgmiisys0 at 0x10080000, usxgmiisys1 at 0x10081000). The hardware
@@ -20,8 +19,6 @@ The driver:

 Based on work by Henry Yen <henry.yen@mediatek.com> and
 Daniel Golle <daniel@makrotopia.org>.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/pcs/Kconfig           |  10 +
 drivers/net/pcs/Makefile          |   1 +
@@ -460,6 +457,3 @@ index 000000000000..f0e7d418db38
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("MediaTek USXGMII PCS driver");
 +MODULE_AUTHOR("Daniel Golle <daniel@makrotopia.org>");
-- 
-2.43.0
-
@@ -1,11 +1,10 @@
-From 8917bfe8fac3e16e2c5958cdbf0b8258a7797539 Mon Sep 17 00:00:00 2001
+From 0d5d470aa3a459225c1c0475a2405c53ebff628f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:43 +0200
 Subject: [PATCH 44/47] net: ethernet: mediatek: add USXGMII support for MT7988
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 Add support for the USXGMII path used by gmac1 and gmac2 on the MT7988
 SoC (BananaPi BPI-R4). Changes:
@@ -27,8 +26,6 @@ SoC (BananaPi BPI-R4). Changes:

 Based on work by Henry Yen <henry.yen@mediatek.com> and
 Daniel Golle <daniel@makrotopia.org>.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/ethernet/mediatek/mtk_eth_path.c | 64 ++++++++++++++++++++
 drivers/net/ethernet/mediatek/mtk_eth_soc.c  | 46 +++++++++++++-
@@ -291,6 +288,3 @@ index 0168e2fbc619..2b27ef392b76 100644
 
 int mtk_eth_offload_init(struct mtk_eth *eth, u8 id);
 int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type,
-- 
-2.43.0
-
@@ -1,8 +1,7 @@
-From c62809d597945068569a95b7ccc0398d99db098f Mon Sep 17 00:00:00 2001
+From 480f415f877f7c736b90629f6107f932bda02fff Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:15:56 +0200
 Subject: [PATCH 45/47] arm64: dts: mediatek: mt7988a: add USXGMII PCS nodes
-Organization: Wires

 Add device nodes for the two USXGMII subsystem blocks (usxgmiisys0 at
 0x10080000 and usxgmiisys1 at 0x10081000), each referencing its clock,
@@ -10,8 +9,6 @@ reset, and xfi_tphy SerDes PHY.

 Wire gmac1 to usxgmiisys1 and gmac2 to usxgmiisys0 via the pcs-handle
 property, so the Ethernet driver can discover the PCS at probe time.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
@@ -60,6 +57,3 @@ index 366203a72d6d..5ae43390f6c2 100644
 			};
 
 			mdio_bus: mdio-bus {
-- 
-2.43.0
-
@@ -1,9 +1,8 @@
-From 12d076e64f65326cf9e453899b6ac5adb31374c3 Mon Sep 17 00:00:00 2001
+From cb3a12311b3501234f0ac9663cce375e8a3d2335 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 6 Apr 2026 14:16:11 +0200
-Subject: [PATCH] arm64: dts: mediatek: bananapi-bpi-r4: enable SFP+ ports and
- WPS button
-Organization: Wires
+Subject: [PATCH 46/47] arm64: dts: mediatek: bananapi-bpi-r4: enable SFP+
+ ports and WPS button

 Enable the SFP+ cages wired to gmac1 and gmac2.  The USXGMII PCS nodes
 and xfi_tphy SerDes are wired up in mt7988a.dtsi; only status = "okay"
@@ -77,6 +76,3 @@ index 0ff69dae45d3..2a904a76f3fe 100644
 };
 
 &gsw_phy0 {
-- 
-2.43.0
-
@@ -1,11 +1,10 @@
-From 4b267c1be4141e0213b49d6d511051b8e6673f7c Mon Sep 17 00:00:00 2001
+From bb0fa3a64e5752f2939c8faa62fa5fd546352b94 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
-Date: Mon, 6 Apr 2026 14:16:16 +0200
+Date: Tue, 7 Apr 2026 07:34:52 +0200
 Subject: [PATCH 47/47] net: phy: sfp: add OEM SFP-10G-T-I quirk
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Wires

 The industrial-temperature variant of the OEM SFP-10G-T copper module
 reports vendor PN "SFP-10G-T-I".  Unlike the base "SFP-10G-T" which is a
@@ -27,7 +26,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 11 insertions(+)

 diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
-index ca0992533572..53aafabeefd4 100644
+index 7a85b758fb1e..2038bee6d950 100644
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
@@ -451,6 +451,16 @@ static void sfp_fixup_rollball_cc(struct sfp *sfp)
@@ -47,7 +46,7 @@ index ca0992533572..53aafabeefd4 100644
 static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
 				struct sfp_module_caps *caps)
 {
-@@ -559,6 +569,7 @@ static const struct sfp_quirk sfp_quirks[] = {
+@@ -564,6 +574,7 @@ static const struct sfp_quirk sfp_quirks[] = {
 	SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
 
 	SFP_QUIRK_F("OEM", "SFP-10G-T", sfp_fixup_rollball_cc),
@@ -55,6 +54,3 @@ index ca0992533572..53aafabeefd4 100644
 	SFP_QUIRK_S("OEM", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
 	SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-D", sfp_quirk_2500basex),
 	SFP_QUIRK_S("OEM", "SFP-2.5G-BX10-U", sfp_quirk_2500basex),
-- 
-2.43.0
-
@@ -1,2 +1,2 @@
 # Calculated with utils/kernel-refresh.sh
-sha256   1c38214fb137bae85b82b82537b5987358621b915ab2a8e4f09e60697c19474f  linux-6.18.21.tar.xz
+sha256   a23c92faf3657385c2c6b5f4edd8f81b808907ebe603fa30699eae224da55f59  linux-6.18.22.tar.xz