Upgrade to kernel 6.18.57

configs/aarch64_defconfig

@@ -26,7 +26,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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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

@@ -26,7 +26,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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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/arm_defconfig

@@ -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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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

configs/arm_minimal_defconfig

@@ -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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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

configs/riscv64_defconfig

@@ -25,7 +25,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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/riscv64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_defconfig

@@ -25,7 +25,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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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

@@ -25,7 +25,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.56"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.57"
 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 Linux kernel to 6.18.56 (LTS)
+- Upgrade Linux kernel to 6.18.57 (LTS)
 - Switch boards advertise one of their port addresses as the LLDP chassis
   ID.  Previously it could be an address no port on the device carried
 - The LAN bridge in the factory config of the Banana Pi R3, R3 mini, R4,

patches/linux/6.18.56/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch → patches/linux/6.18.57/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,4 +1,4 @@
-From ca34ebe2b40b53b52a5ea6fb00b7bb36eeeabb5f Mon Sep 17 00:00:00 2001
+From a3d812890f51189fc70b419a37f2fe038fe2395d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 001/102] net: phy: marvell10g: Support firmware loading on
@@ -15,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 @@

patches/linux/6.18.56/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch → patches/linux/6.18.57/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,4 +1,4 @@
-From 59532ff26cccf476b4e6f8eeaf2e733c93106a78 Mon Sep 17 00:00:00 2001
+From 2a59f9d7a2c7d3c847db7ee4e5bf2f4ddf7b4702 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 002/102] net: phy: marvell10g: Fix power-up when strapped to
@@ -12,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)

patches/linux/6.18.56/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch → patches/linux/6.18.57/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,4 +1,4 @@
-From 2881f5a7008a4b7a214f63960f1d199f55a7a78a Mon Sep 17 00:00:00 2001
+From a43ab064f5f15038c30db9b6d9f3ccdc7eaf57ab Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 003/102] net: phy: marvell10g: Add LED support for 88X3310
@@ -21,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 @@

patches/linux/6.18.56/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch → patches/linux/6.18.57/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,4 +1,4 @@
-From 67a62752bdb5e1e45982289b2eda1f5df4ca6f47 Mon Sep 17 00:00:00 2001
+From c2c0be4516d1c42574bf5ec923cd1b28749ed079 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 004/102] net: phy: marvell10g: Support LEDs tied to a single
@@ -18,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 {

patches/linux/6.18.56/0005-net-phy-Do-not-resume-PHY-when-attaching.patch → patches/linux/6.18.57/0005-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,4 +1,4 @@
-From a60255d4ba8ea888ecb86e92a2c65334a26f6384 Mon Sep 17 00:00:00 2001
+From 531ee82493ae9b2419a0d00891cab20fa1c99751 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 005/102] net: phy: Do not resume PHY when attaching
@@ -19,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 26b08e3dbd1de..7597308534a0a 100644
+index 26b08e3dbd1d..7597308534a0 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
 @@ -1753,7 +1753,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

patches/linux/6.18.56/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch → patches/linux/6.18.57/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,4 +1,4 @@
-From 3fc8e2a80589a5a5ae02fac7b3f97f195cb90930 Mon Sep 17 00:00:00 2001
+From 9d9a85e79b3ed5844e47efbab43c854b5cd50695 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 006/102] net: bridge: avoid classifying unknown multicast as
@@ -26,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 {
@@ -38,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,
@@ -61,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 3055a72959cb6..0e5e7821d44cd 100644
+index 3055a72959cb..0e5e7821d44c 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)
@@ -101,7 +101,7 @@ index 3055a72959cb6..0e5e7821d44cd 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(
@@ -140,7 +140,7 @@ index dea09096ad0fb..f0a613238e0d5 100644
  				continue;
  			break;
 diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index ac0f56076e93b..9af38febff25d 100644
+index ac0f56076e93..9af38febff25 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
@@ -170,10 +170,10 @@ index ac0f56076e93b..9af38febff25d 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 fda1f89ee22ae..db837e27ed8a2 100644
+index 78682aace574..8a2e7f669ab3 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -3838,6 +3838,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
+@@ -3851,6 +3851,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
  	u64_stats_update_end(&pstats->syncp);
  }
 
@@ -185,7 +185,7 @@ index fda1f89ee22ae..db837e27ed8a2 100644
  static void br_multicast_pim(struct net_bridge_mcast *brmctx,
  			     struct net_bridge_mcast_port *pmctx,
  			     const struct sk_buff *skb)
-@@ -3884,7 +3889,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
+@@ -3897,7 +3902,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
 
  	if (err == -ENOMSG) {
  		if (!ipv4_is_local_multicast(ip_hdr(skb)->daddr)) {
@@ -195,7 +195,7 @@ index fda1f89ee22ae..db837e27ed8a2 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);
-@@ -3953,7 +3959,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
+@@ -3966,7 +3972,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))
@@ -206,7 +206,7 @@ index fda1f89ee22ae..db837e27ed8a2 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 e4c8bc8576df6..b99aa1d6a2608 100644
+index e4c8bc8576df..b99aa1d6a260 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -491,6 +491,7 @@ enum net_bridge_opts {

patches/linux/6.18.56/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch → patches/linux/6.18.57/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,4 +1,4 @@
-From 8f5cf3a448d6e7a1d00043debd0bf1fcaf706680 Mon Sep 17 00:00:00 2001
+From 8650a96e792f68b3fe6b0e48a56bc1dbe478b899 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 007/102] net: bridge: Ignore router ports when forwarding L2
@@ -16,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 b99aa1d6a2608..93f3bbc37590a 100644
+index b99aa1d6a260..93f3bbc37590 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -1088,7 +1088,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,

patches/linux/6.18.56/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch → patches/linux/6.18.57/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,4 +1,4 @@
-From a42722822b7ff8ea8ac5e65a8449bb72b1ef8c05 Mon Sep 17 00:00:00 2001
+From 3168dbb99768d0967714da20f1d59ba2b039e287 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 008/102] net: bridge: drop delay for applying strict multicast
@@ -24,10 +24,10 @@ 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 db837e27ed8a2..2ccfe3c7b20e3 100644
+index 8a2e7f669ab3..f63f47b08751 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)
+@@ -1774,10 +1774,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
  }
  #endif
 
@@ -38,7 +38,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
  					    struct br_ip *ip,
  					    struct sk_buff *skb)
-@@ -3259,12 +3255,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
+@@ -3272,12 +3268,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
 
  static void
  br_multicast_update_query_timer(struct net_bridge_mcast *brmctx,
@@ -52,7 +52,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
  }
 
-@@ -3455,13 +3447,12 @@ static void
+@@ -3468,13 +3460,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,
@@ -68,7 +68,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	br_ip4_multicast_mark_router(brmctx, pmctx);
  }
 
-@@ -3470,13 +3461,12 @@ static void
+@@ -3483,13 +3474,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,
@@ -84,7 +84,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	br_ip6_multicast_mark_router(brmctx, pmctx);
  }
  #endif
-@@ -3530,7 +3520,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3543,7 +3533,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
 
  		br_ip4_multicast_query_received(brmctx, pmctx,
  						&brmctx->ip4_other_query,
@@ -93,7 +93,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  		goto out;
  	}
 
-@@ -3618,7 +3608,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
+@@ -3631,7 +3621,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
 
  		br_ip6_multicast_query_received(brmctx, pmctx,
  						&brmctx->ip6_other_query,
@@ -102,7 +102,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  		goto out;
  	} else if (!group) {
  		goto out;
-@@ -4124,8 +4114,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4137,8 +4127,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);
@@ -111,7 +111,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	timer_setup(&brmctx->ip4_own_query.timer,
  		    br_ip4_multicast_query_expired, 0);
  #if IS_ENABLED(CONFIG_IPV6)
-@@ -4133,8 +4121,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
+@@ -4146,8 +4134,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);
@@ -120,7 +120,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	timer_setup(&brmctx->ip6_own_query.timer,
  		    br_ip6_multicast_query_expired, 0);
  #endif
-@@ -4269,12 +4255,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
+@@ -4282,12 +4268,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
  {
  	timer_delete_sync(&brmctx->ip4_mc_router_timer);
  	timer_delete_sync(&brmctx->ip4_other_query.timer);
@@ -133,7 +133,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	timer_delete_sync(&brmctx->ip6_own_query.timer);
  #endif
  }
-@@ -4747,8 +4731,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
+@@ -4760,8 +4744,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
 
  int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
  {
@@ -142,7 +142,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  	val = !!val;
 
  	spin_lock_bh(&brmctx->br->multicast_lock);
-@@ -4759,19 +4741,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
+@@ -4772,19 +4754,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
  	if (!val)
  		goto unlock;
 
@@ -163,7 +163,7 @@ index db837e27ed8a2..2ccfe3c7b20e3 100644
  #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 93f3bbc37590a..ec6a85023b5ac 100644
+index 93f3bbc37590..ec6a85023b5a 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -80,7 +80,6 @@ struct bridge_mcast_own_query {