Merge pull request #1056 from kernelkit/upgrade-kernel

mattiaswal · web-flow · commit 22cf97fdbd8f · 2025-05-30T12:49:48.000+02:00
diff --git a/configs/aarch64_defconfig b/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.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"
diff --git a/configs/rpi4_defconfig b/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.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 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"
diff --git a/configs/x86_64_defconfig b/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.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.31"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -3,6 +3,15 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v25.06.0][UNRELEASED]
+-------------------------
+
+### Changes
+- Upgrade Linux kernel to 6.12.31 (LTS)
+
+### Fixes
+
+
 [v25.05.0][] - 2025-05-27
 -------------------------
 
diff --git a/patches/linux/6.12.31/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.31/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch
@@ -1,4 +1,4 @@
-From 735a3f8537b65fbe5d2fe5e97beb485cffa1bbbe Mon Sep 17 00:00:00 2001
+From 13969c362d0dd613d9aedc7bb49c8eb1ed3ce66c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
diff --git a/patches/linux/6.12.31/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.31/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch
@@ -1,4 +1,4 @@
-From a9cadaebc7868f3f37c343642e631e3db2ea27db Mon Sep 17 00:00:00 2001
+From 4e41d95288e47ddcd177680604bfc7f6df3b9e5a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access
diff --git a/patches/linux/6.12.31/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.31/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch
@@ -1,4 +1,4 @@
-From 5f8612dc0445ca95a7428bf7b837612406875b07 Mon Sep 17 00:00:00 2001
+From d6d0ed5fa793f5cd9842ec6dd8fadf9135706319 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via
diff --git a/patches/linux/6.12.31/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.31/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch
@@ -1,4 +1,4 @@
-From 730dfa9a57604ff0b099cc5e244e42fdbebbe0d9 Mon Sep 17 00:00:00 2001
+From 9bbea1b2a0c9583e887082deb76b01720d9bdc5c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
diff --git a/patches/linux/6.12.31/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.31/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch
@@ -1,4 +1,4 @@
-From 8ce7a3a19676c148e6c247641000a5d5b86c6a3d Mon Sep 17 00:00:00 2001
+From 12411c9e44bd240a2da7507b8f9c9d8fe1bc48c4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
 Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure
diff --git a/patches/linux/6.12.31/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.31/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch
@@ -1,4 +1,4 @@
-From 79741bd8278bf1958ef6f414e89d7052d1c9486b Mon Sep 17 00:00:00 2001
+From c7aa99fa5eaa7236a8fba3a6f43a0c979aa96d41 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
 Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X
diff --git a/patches/linux/6.12.31/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.31/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch
@@ -1,4 +1,4 @@
-From 4ada7a3d2fa1fdb0abe4485a8f80a50c699d2607 Mon Sep 17 00:00:00 2001
+From 04ab2921eac3c94fda2c8e50e74309ab4e74545d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial
diff --git a/patches/linux/6.12.31/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.31/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch
@@ -1,4 +1,4 @@
-From ef42cca1aee6a3756f6995368bf740d6c92e8ab4 Mon Sep 17 00:00:00 2001
+From 2814bbe0c0e37be13c8d361d72efe1664327f34b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses
diff --git a/patches/linux/6.12.31/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.31/0009-net-dsa-Support-EtherType-based-priority-overrides.patch
@@ -1,4 +1,4 @@
-From 927b942567ad59e71b44095c054e1565e2e1a01f Mon Sep 17 00:00:00 2001
+From 252bdfa662df12ef8a031d77561b3300485d96e9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides
diff --git a/patches/linux/6.12.31/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.31/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch
@@ -1,4 +1,4 @@
-From ef919d2970639d542534b6f27605c0a7d053e57f Mon Sep 17 00:00:00 2001
+From 295787631df9dfe853368863398657d71a9ea908 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority
diff --git a/patches/linux/6.12.31/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.31/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch
@@ -1,4 +1,4 @@
-From 06cf0fc089d4b4f4d0d00384d0b38bb87dca0494 Mon Sep 17 00:00:00 2001
+From 3712391cd449906a1876905580ff2576a82b9fae Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support
diff --git a/patches/linux/6.12.31/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.31/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch
@@ -1,4 +1,4 @@
-From 44ff969f4646f5d6987c6c6afb33c9894116687d Mon Sep 17 00:00:00 2001
+From 182d110828b56014fb1defd1ab3b8f9ccc5da754 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
diff --git a/patches/linux/6.12.31/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.31/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch
@@ -1,4 +1,4 @@
-From 868a65caca9a649616a9aef0e319f3744bda3df3 Mon Sep 17 00:00:00 2001
+From 4e1aa1aba1be0e06c35ca65b355f7928ae212a4e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
diff --git a/patches/linux/6.12.31/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.31/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch
@@ -1,4 +1,4 @@
-From 7e3b3153f5edfdcc7c4460744efbd3f8c0f4bf4b Mon Sep 17 00:00:00 2001
+From 1ffc399bcbc00ca7df9900404fb7bc13ac95b34d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on
diff --git a/patches/linux/6.12.31/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.31/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch
@@ -1,4 +1,4 @@
-From 7769ff987e8619d012863851eb14dec613bee3fa Mon Sep 17 00:00:00 2001
+From 90e7397e12eb78b0d2683b68fe63c00d316da84a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to
diff --git a/patches/linux/6.12.31/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.31/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch
@@ -1,4 +1,4 @@
-From 3b64cbe7764bb3cb77953c8d0b8676c685c9f0b5 Mon Sep 17 00:00:00 2001
+From 83dba1584515e3d938c622ae85eae45f60ca2ae5 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310
diff --git a/patches/linux/6.12.31/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.31/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch
@@ -1,4 +1,4 @@
-From 9b6d4099be8eb492d1ff46561b74f30688e53aef Mon Sep 17 00:00:00 2001
+From 217ec54363c4b934575c801ceb9d58cc412f2c1d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single
diff --git a/patches/linux/6.12.31/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.31/0018-net-phy-Do-not-resume-PHY-when-attaching.patch
@@ -1,4 +1,4 @@
-From 8ca0ef48d4530da5cb6b807fd8b0901c916b0e8c Mon Sep 17 00:00:00 2001
+From 285d59f5331936595c8ef4daa0090bf9e18dd364 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching
diff --git a/patches/linux/6.12.31/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.31/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch
@@ -1,4 +1,4 @@
-From 848fdabbb0cd804dceac4ea34d47a422a65e7227 Mon Sep 17 00:00:00 2001
+From dbef721d3c49765cbc6b6dce6e3a9ede4d9c1eeb Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as
@@ -188,7 +188,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 041f6e571a20..40651b07df94 100644
+index df502cc1191c..b456cf9ec1cc 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -483,6 +483,7 @@ enum net_bridge_opts {
@@ -199,7 +199,7 @@ index 041f6e571a20..40651b07df94 100644
  };
  
  struct net_bridge {
-@@ -886,8 +887,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
+@@ -887,8 +888,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
  		bool local_rcv, bool local_orig);
  int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
  void br_flood(struct net_bridge *br, struct sk_buff *skb,
@@ -210,7 +210,7 @@ index 041f6e571a20..40651b07df94 100644
  
  /* return true if both source port and dest port are isolated */
  static inline bool br_skb_isolated(const struct net_bridge_port *to,
-@@ -1408,6 +1409,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
+@@ -1409,6 +1410,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
  {
  }
  
diff --git a/patches/linux/6.12.31/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.31/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch
@@ -1,4 +1,4 @@
-From 930edf3bd31e77703ca805d816ed7b2cac695e44 Mon Sep 17 00:00:00 2001
+From 544772547168d2b2f6280ca5104281cca1cd1afe Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2
@@ -16,10 +16,10 @@ 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 40651b07df94..e90b4f5cab76 100644
+index b456cf9ec1cc..aad99a27d968 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -1086,7 +1086,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
+@@ -1087,7 +1087,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
diff --git a/patches/linux/6.12.31/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.31/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch
@@ -1,4 +1,4 @@
-From ec644e878010241f593bfccb2f7127dec6f69294 Mon Sep 17 00:00:00 2001
+From 5174ddcbc0ee0410b0114a116080032011adaba5 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast
@@ -163,7 +163,7 @@ index 3137c1fcfc6a..34be07a1fd00 100644
  #endif
  
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index e90b4f5cab76..73b78c594564 100644
+index aad99a27d968..ee8c2268ab5a 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -78,7 +78,6 @@ struct bridge_mcast_own_query {
@@ -174,7 +174,7 @@ index e90b4f5cab76..73b78c594564 100644
  };
  
  /* selected querier */
-@@ -1164,8 +1163,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
+@@ -1165,8 +1164,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
  		own_querier_enabled = false;
  	}
  
diff --git a/patches/linux/6.12.31/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.31/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch
@@ -1,4 +1,4 @@
-From d46286898fbadf40a2fe1f4e449a3acdaede788b Mon Sep 17 00:00:00 2001
+From 04773017c6b110e772affd956bcebc412b5420a5 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 22/27] net: bridge: Differentiate MDB additions from
@@ -40,7 +40,7 @@ index db7254d52d93..63508279df47 100644
  	RTM_NEWNSID = 88,
  #define RTM_NEWNSID RTM_NEWNSID
 diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
-index 1a52a0bca086..d5757ab72d2f 100644
+index 7e1ad229e133..3b1873e7c499 100644
 --- a/net/bridge/br_mdb.c
 +++ b/net/bridge/br_mdb.c
 @@ -734,7 +734,7 @@ static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
diff --git a/patches/linux/6.12.31/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.31/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch
@@ -1,4 +1,4 @@
-From cd8e2556f6b220fd6795779a37fbd6ff3159dcaf Mon Sep 17 00:00:00 2001
+From 84f59ec2cbacdb14b98099815cbeebc5aff469f8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 23/27] nvmem: layouts: onie-tlv: Let device probe even when
diff --git a/patches/linux/6.12.31/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.31/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch
@@ -1,4 +1,4 @@
-From bbd05c87d8a872731eb2f46ffc63bcddf80bbfca Mon Sep 17 00:00:00 2001
+From 29d0994560d6607b48d1b8c8d80f3a7292454766 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
 Subject: [PATCH 24/27] usb: core: adjust log level for unauthorized devices
diff --git a/patches/linux/6.12.31/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.31/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch
@@ -1,4 +1,4 @@
-From 6612adb18ad9ec35d81b131ebcff0b358a993a62 Mon Sep 17 00:00:00 2001
+From 1eb50ba9d7987e57e6cd2693df722f71adef0fdb Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
 Subject: [PATCH 25/27] net: dsa: mv88e6xxx: collapse disabled state into
diff --git a/patches/linux/6.12.31/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.31/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch
@@ -1,4 +1,4 @@
-From c95150639c61db088df0c7c2f9b0e18c0ef64550 Mon Sep 17 00:00:00 2001
+From c671038b88726d833cafcaa2763e8ce55d01d83c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
 Subject: [PATCH 26/27] net: dsa: mv88e6xxx: Only activate LAG offloading when
diff --git a/patches/linux/6.12.31/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.12.31/0027-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch
@@ -1,4 +1,4 @@
-From 18d9518aba9afbd190e90a2661525bd4bf6d02d0 Mon Sep 17 00:00:00 2001
+From 37b00977f238eaa8999b3badb02b2a08be779496 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
 Subject: [PATCH 27/27] net: usb: r8152: add r8153b support for link/activity
@@ -18,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 96fa3857d8e2..cddb025aa56b 100644
+index 2cab046749a9..c9947ad320ff 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
 @@ -41,6 +41,11 @@
diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash
@@ -1,2 +1,2 @@
 # Calculated with ../utils/kernel-refresh.sh
-sha256   df046a48971e40ce0b2e003e7e55b6b1e7da2912120eb216d5d6c8450c9cf82e  linux-6.12.30.tar.xz
+sha256   b04c5b3e5df6e0aa5e9cd1efe527fac99f9dd39a43b97f13b22f8ca93e524ba7  linux-6.12.31.tar.xz

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 735a3f8537b65fbe5d2fe5e97beb485cffa1bbbe Mon Sep 17 00:00:00 2001`
	`1`	`+From 13969c362d0dd613d9aedc7bb49c8eb1ed3ce66c Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <[email protected]>`
`3`	`3`	`Date: Tue, 12 Mar 2024 10:27:24 +0100`
`4`	`4`	`Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From a9cadaebc7868f3f37c343642e631e3db2ea27db Mon Sep 17 00:00:00 2001`
	`1`	`+From 4e41d95288e47ddcd177680604bfc7f6df3b9e5a Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <[email protected]>`
`3`	`3`	`Date: Wed, 27 Mar 2024 15:52:43 +0100`
`4`	`4`	`Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 5f8612dc0445ca95a7428bf7b837612406875b07 Mon Sep 17 00:00:00 2001`
	`1`	`+From d6d0ed5fa793f5cd9842ec6dd8fadf9135706319 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Tobias Waldekranz <[email protected]>`
`3`	`3`	`Date: Mon, 22 Apr 2024 23:18:01 +0200`
`4`	`4`	`Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via`