Bump kernel to 6.12.35 (LTS)

configs/aarch64_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 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

configs/aarch64_minimal_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 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

configs/r2s_defconfig

@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"

configs/rpi4_defconfig

@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 BR2_LINUX_KERNEL_PATCH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/bcm2711-rpi-4-b-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rpi/bcm2711_defconfig"

configs/x86_64_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 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

configs/x86_64_minimal_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.34"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
 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

doc/ChangeLog.md

@@ -8,7 +8,7 @@ All notable changes to the project are documented in this file.
 
 ### Changes
 - Upgrade Buildroot to 2025.02.4 (LTS)
-- Upgrade Linux kernel to 6.12.34 (LTS)
+- Upgrade Linux kernel to 6.12.35 (LTS)
 - Upgrade curiOS built-in containers to v25.06.0
 - Add support for setting mode of a container content mount, issue #1070
 - Add Wi-Fi client support and add support for some USB-Wi-Fi cards

patches/linux/6.12.34/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch → patches/linux/6.12.35/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

@@ -1,4 +1,4 @@
-From 07a9011b88c9cae20bbdd650514190c6400dcb89 Mon Sep 17 00:00:00 2001
+From 072c2f0732bc1a55aaeb9b5319a71bb472e2fd7d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for

patches/linux/6.12.34/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch → patches/linux/6.12.35/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

@@ -1,4 +1,4 @@
-From 3678a7260a7da4774284d2715d4d8854da276ca3 Mon Sep 17 00:00:00 2001
+From 7b18b787450759f1c2507c7b65c81c3686040c90 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access

patches/linux/6.12.34/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch → patches/linux/6.12.35/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

@@ -1,4 +1,4 @@
-From 05b129243b30d708f9eb19d12e935147d794b724 Mon Sep 17 00:00:00 2001
+From 379dd2a00dc647b034befead65b26e467e63ae75 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via

patches/linux/6.12.34/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch → patches/linux/6.12.35/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

@@ -1,4 +1,4 @@
-From 4ca8b168deb9cd27630533470d76a0c54da4a6a3 Mon Sep 17 00:00:00 2001
+From fd676f49b5aa5a1d372446be9ee01d1f126bcd54 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user

patches/linux/6.12.34/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch → patches/linux/6.12.35/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch

@@ -1,4 +1,4 @@
-From 426f4c9aa77719ced773b2064c13bd3b021fac4f Mon Sep 17 00:00:00 2001
+From 2aeb87ab82b7b9fb37e6b1c830dec5374158aa5d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
 Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure

patches/linux/6.12.34/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch → patches/linux/6.12.35/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch

@@ -1,4 +1,4 @@
-From 02cbb60020f0d60e30217be349ed024985bfe76c Mon Sep 17 00:00:00 2001
+From 3de6f58239d6b09c3fe1e0978a556481be8f3a95 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
 Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X

patches/linux/6.12.34/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch → patches/linux/6.12.35/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch

@@ -1,4 +1,4 @@
-From 2b7776f26445b083a6d3816363dd5537b97470d4 Mon Sep 17 00:00:00 2001
+From f28803088158ddf97186f143f4bdc516e42e9354 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial

patches/linux/6.12.34/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch → patches/linux/6.12.35/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch

@@ -1,4 +1,4 @@
-From 1e8374b7188581f0ee252d3b54b44f6c15ae7d2e Mon Sep 17 00:00:00 2001
+From bbbf265610459ec49afcde923d1872ca3e2ad679 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses

patches/linux/6.12.34/0009-net-dsa-Support-EtherType-based-priority-overrides.patch → patches/linux/6.12.35/0009-net-dsa-Support-EtherType-based-priority-overrides.patch

@@ -1,4 +1,4 @@
-From ea86c6e83dc13ebedcf31348090fa3cc4778750b Mon Sep 17 00:00:00 2001
+From 797ed124853b8f0ef6d110e1633be2637c97c31d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides

patches/linux/6.12.34/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch → patches/linux/6.12.35/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch

@@ -1,4 +1,4 @@
-From 896db342fbb9e0e99b772a5d236ae2029726bda2 Mon Sep 17 00:00:00 2001
+From ea2d865a2101317e22c60143e891d643feac8e8c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority

patches/linux/6.12.34/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch → patches/linux/6.12.35/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch

@@ -1,4 +1,4 @@
-From 12b579e4ad2a0c0a8fd4901563076f87534fcb58 Mon Sep 17 00:00:00 2001
+From a239baf492b7c4a1280562bb9478006627b73036 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support

patches/linux/6.12.34/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch → patches/linux/6.12.35/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch

@@ -1,4 +1,4 @@
-From d0a066addb905d79d73791c7601d98b5c1bae6ed Mon Sep 17 00:00:00 2001
+From 60ac4461cef9b2024df52c23a040b100093ba1d7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both

patches/linux/6.12.34/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch → patches/linux/6.12.35/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch

@@ -1,4 +1,4 @@
-From 828d332b13bb4a75e1227ebb548ba63b71e588ea Mon Sep 17 00:00:00 2001
+From d3b20e07514928830034d4af2eb7660bfcacc1e0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated

patches/linux/6.12.34/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch → patches/linux/6.12.35/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,4 +1,4 @@
-From 6a9c051a76197c0eacf858d266fc4b8f526874fb Mon Sep 17 00:00:00 2001
+From b4870c7df5d6659da439e8f1322dd5496a15445e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on

patches/linux/6.12.34/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch → patches/linux/6.12.35/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,4 +1,4 @@
-From 5b35427107657a471f0282124c5c484bbb93fdbf Mon Sep 17 00:00:00 2001
+From 6161b59334064ebfc0b80b0214fa12e6d042400e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to

patches/linux/6.12.34/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch → patches/linux/6.12.35/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,4 +1,4 @@
-From b5941d7cdbe41cffbfeca3b920954de3140a2a40 Mon Sep 17 00:00:00 2001
+From 403075caa172cf8e5c50346a86698b0a909a9263 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310

patches/linux/6.12.34/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch → patches/linux/6.12.35/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,4 +1,4 @@
-From 32faa6301dbc406ba4e9b57345b3703f0a78b66e Mon Sep 17 00:00:00 2001
+From 84ca381445809f1d796c461a5b085ff4a3b7f93e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single

patches/linux/6.12.34/0018-net-phy-Do-not-resume-PHY-when-attaching.patch → patches/linux/6.12.35/0018-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,4 +1,4 @@
-From c1339df45da3816dbe5bcdbc850a5e313eaa7b3d Mon Sep 17 00:00:00 2001
+From 47eddfb80fd6bbbc186b0d8a93697c36840168e8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <[email protected]>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching

patches/linux/6.12.34/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch → patches/linux/6.12.35/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,4 +1,4 @@
-From 15e00c59d7264bbd33e715fb1bd19015688bd36e Mon Sep 17 00:00:00 2001
+From 761e5315fc2bac3809258e9719efd1475a73ac14 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <[email protected]>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as
@@ -153,10 +153,10 @@ index ceaa5a89b947..e54d648db7de 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 b2ae0d2434d2..3137c1fcfc6a 100644
+index 733ff6b758f6..b1799e03403f 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -3774,6 +3774,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
+@@ -3835,6 +3835,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
  	u64_stats_update_end(&pstats->syncp);
  }
 
@@ -168,7 +168,7 @@ index b2ae0d2434d2..3137c1fcfc6a 100644
  static void br_multicast_pim(struct net_bridge_mcast *brmctx,
  			     struct net_bridge_mcast_port *pmctx,
  			     const struct sk_buff *skb)
-@@ -3820,7 +3825,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
+@@ -3881,7 +3886,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 b2ae0d2434d2..3137c1fcfc6a 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);
-@@ -3889,7 +3895,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
+@@ -3950,7 +3956,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))
@@ -189,7 +189,7 @@ index b2ae0d2434d2..3137c1fcfc6a 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 df502cc1191c..b456cf9ec1cc 100644
+index 6a1bce8959af..ed5325c6add9 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -483,6 +483,7 @@ enum net_bridge_opts {
@@ -211,7 +211,7 @@ index df502cc1191c..b456cf9ec1cc 100644
 
  /* return true if both source port and dest port are isolated */
  static inline bool br_skb_isolated(const struct net_bridge_port *to,
-@@ -1409,6 +1410,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
+@@ -1410,6 +1411,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
  {
  }
 

patches/linux/6.12.34/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch → patches/linux/6.12.35/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,4 +1,4 @@
-From e6437aa52c473026cd24baf18ec2ccd70ed984d0 Mon Sep 17 00:00:00 2001
+From 41c6eeb5c4042027eac70243dd28bcaf963ac6b8 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <[email protected]>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2
@@ -17,10 +17,10 @@ Signed-off-by: Joachim Wiberg <[email protected]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index b456cf9ec1cc..aad99a27d968 100644
+index ed5325c6add9..0afb886b9a30 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -1087,7 +1087,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
+@@ -1088,7 +1088,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
  	if (skb->protocol == htons(ETH_P_IPV6))
  		return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list));
  #endif

patches/linux/6.12.34/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch → patches/linux/6.12.35/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,4 +1,4 @@
-From 778a23d3f32bccec281c3cd8bf36122fbb3f6f7c Mon Sep 17 00:00:00 2001
+From f831362d0a5717cbb18a9173defca6ec4d886377 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <[email protected]>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast
@@ -25,7 +25,7 @@ Signed-off-by: Joachim Wiberg <[email protected]>
  2 files changed, 8 insertions(+), 38 deletions(-)
 
 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 3137c1fcfc6a..34be07a1fd00 100644
+index b1799e03403f..282105bdca85 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
 @@ -1762,10 +1762,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
@@ -39,7 +39,7 @@ index 3137c1fcfc6a..34be07a1fd00 100644
  static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
  					    struct br_ip *ip,
  					    struct sk_buff *skb)
-@@ -3196,12 +3192,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
+@@ -3257,12 +3253,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 3137c1fcfc6a..34be07a1fd00 100644
  	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
  }
 
-@@ -3392,13 +3384,12 @@ static void
+@@ -3453,13 +3445,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 3137c1fcfc6a..34be07a1fd00 100644
  	br_ip4_multicast_mark_router(brmctx, pmctx);
  }
 
-@@ -3407,13 +3398,12 @@ static void
+@@ -3468,13 +3459,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 3137c1fcfc6a..34be07a1fd00 100644
  	br_ip6_multicast_mark_router(brmctx, pmctx);
  }
  #endif
-@@ -3467,7 +3457,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3528,7 +3518,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 3137c1fcfc6a..34be07a1fd00 100644
  		goto out;
  	}
 
-@@ -3555,7 +3545,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3616,7 +3606,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 3137c1fcfc6a..34be07a1fd00 100644
  		goto out;
  	} else if (!group) {
  		goto out;
-@@ -4063,8 +4053,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4124,8 +4114,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 3137c1fcfc6a..34be07a1fd00 100644
  	timer_setup(&brmctx->ip4_own_query.timer,
  		    br_ip4_multicast_query_expired, 0);
  #if IS_ENABLED(CONFIG_IPV6)
-@@ -4072,8 +4060,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4133,8 +4121,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 3137c1fcfc6a..34be07a1fd00 100644
  	timer_setup(&brmctx->ip6_own_query.timer,
  		    br_ip6_multicast_query_expired, 0);
  #endif
-@@ -4208,12 +4194,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
+@@ -4269,12 +4255,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 3137c1fcfc6a..34be07a1fd00 100644
  	del_timer_sync(&brmctx->ip6_own_query.timer);
  #endif
  }
-@@ -4641,8 +4625,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
+@@ -4728,8 +4712,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 3137c1fcfc6a..34be07a1fd00 100644
  	val = !!val;
 
  	spin_lock_bh(&brmctx->br->multicast_lock);
-@@ -4653,19 +4635,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
+@@ -4740,19 +4722,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
  	if (!val)
  		goto unlock;
 
@@ -164,7 +164,7 @@ index 3137c1fcfc6a..34be07a1fd00 100644
  #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index aad99a27d968..ee8c2268ab5a 100644
+index 0afb886b9a30..5b5b2c2442a5 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -78,7 +78,6 @@ struct bridge_mcast_own_query {
@@ -175,7 +175,7 @@ index aad99a27d968..ee8c2268ab5a 100644
  };
 
  /* selected querier */
-@@ -1165,8 +1164,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
+@@ -1166,8 +1165,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
  		own_querier_enabled = false;
  	}