Skip to content

Commit

Permalink
Merge pull request #860 from kernelkit/linux-6.12.3
Browse files Browse the repository at this point in the history
linux: Upgrade to 6.12.3
  • Loading branch information
wkz authored Dec 6, 2024
2 parents 1db039d + ad32129 commit 219c610
Show file tree
Hide file tree
Showing 29 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion configs/aarch64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3"
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
Expand Down
2 changes: 1 addition & 1 deletion configs/aarch64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3"
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
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3"
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
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3"
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
Expand Down
2 changes: 1 addition & 1 deletion doc/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ All notable changes to the project are documented in this file.
- Add support for more mDNS settings: allow/deny interfaces, acting
as "reflector" and filtering of reflected services. Issue #678
- Review of default `sysctl` settings, issue #829
- Upgrade Linux kernel to 6.12.1 (presumed LTS)
- Upgrade Linux kernel to 6.12.3 (LTS)

### Fixes

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f5f25417c0e65f45c6a254e5a1f00c4fd5919058 Mon Sep 17 00:00:00 2001
From 71fe6d55812e13fcbcbc703b925a3be5789fa360 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 12 Mar 2024 10:27:24 +0100
Subject: [PATCH 01/24] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fc68336f274aac22426b271c4d4a7ef0bfc76006 Mon Sep 17 00:00:00 2001
From b1ebd0aa174cae173c09772ff465eee20bfb8cf1 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 27 Mar 2024 15:52:43 +0100
Subject: [PATCH 02/24] net: dsa: mv88e6xxx: Improve indirect register access
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 66e1fc9ab54680989c02dab907743133674a07cf Mon Sep 17 00:00:00 2001
From 178f00dd84b9c76f065edba012d51d82cda89188 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Mon, 22 Apr 2024 23:18:01 +0200
Subject: [PATCH 03/24] net: dsa: mv88e6xxx: Honor ports being managed via
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7c9d33f9176e5d2173646aee7b15176e40fabbb0 Mon Sep 17 00:00:00 2001
From 41c8514d46aed546dae97817b582966aec19ac19 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 24 Apr 2024 22:41:04 +0200
Subject: [PATCH 04/24] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 408a1681d4bbb44ede8d7d738f96a2fc27deb813 Mon Sep 17 00:00:00 2001
From a78a31711dcb661b1b0f4d2a6e692112b53ee1d3 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 Nov 2023 19:44:32 +0100
Subject: [PATCH 05/24] net: dsa: mv88e6xxx: Add LED infrastructure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9bfe65e40336c449720f96230ccc22c831045e9d Mon Sep 17 00:00:00 2001
From 759f9f0a451dc0c3bc8e268ab2609e911f05e472 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 Nov 2023 21:59:35 +0100
Subject: [PATCH 06/24] net: dsa: mv88e6xxx: Add LED support for 6393X
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0f009562d467672b7f5ff9366ad4ec9df9044137 Mon Sep 17 00:00:00 2001
From 18e2a5f297ee800b2c51adbf9958bc2b96e2370d Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 28 May 2024 10:38:42 +0200
Subject: [PATCH 07/24] net: dsa: tag_dsa: Use tag priority as initial
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 027a5fcd4da6cf02ff8d2f6dc5ff1202f81db8ca Mon Sep 17 00:00:00 2001
From 6fc99a4c2e4a263acf2ba3fb9e8a85f12661ba60 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 16 Jan 2024 16:00:55 +0100
Subject: [PATCH 08/24] net: dsa: Support MDB memberships whose L2 addresses
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ef232a32e69a5edb1a62067d4871fb70e8c3ddd7 Mon Sep 17 00:00:00 2001
From 7b546aa81ea913bf3795dc4c843992c84c29d3b7 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 21 Mar 2024 19:12:15 +0100
Subject: [PATCH 09/24] net: dsa: Support EtherType based priority overrides
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 48338a7ca5f0a7be3b16acd1762ec0b73088ac4c Mon Sep 17 00:00:00 2001
From 98a469ebd1c7a90aa3ab7dffcd58515d0b18376a Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Fri, 22 Mar 2024 16:15:43 +0100
Subject: [PATCH 10/24] net: dsa: mv88e6xxx: Support EtherType based priority
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2c3ceab75d2ebb36326a5bc09b17d9409a11d2fa Mon Sep 17 00:00:00 2001
From f96b11cbcdf0cfaa60ed9be75f5b2e32c5d6c036 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 28 May 2024 11:04:22 +0200
Subject: [PATCH 11/24] net: dsa: mv88e6xxx: Add mqprio qdisc support
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b1f2d857a7457c8c965d281d8c8875ad491670a7 Mon Sep 17 00:00:00 2001
From 0dea11bbeb08eab148807853626061591e5b8a7c Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 29 May 2024 13:20:41 +0200
Subject: [PATCH 12/24] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From eedb27bcce73ed62534528bd098b897954f98d3c Mon Sep 17 00:00:00 2001
From 15d0f3332c1253f90d47e4a949baa3bba42601d0 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 26 Nov 2024 19:45:59 +0100
Subject: [PATCH 13/24] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f84d14369aad6ad2d2aec71dcf907d2ff70aa4fa Mon Sep 17 00:00:00 2001
From f07acc439e8e803cb16528db21f0dfa11029caf4 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 19 Sep 2023 18:38:10 +0200
Subject: [PATCH 14/24] net: phy: marvell10g: Support firmware loading on
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0ffa9ba9b48fbd9f818b8c789202ae85bc401f47 Mon Sep 17 00:00:00 2001
From 5fece876f73fadd87c9de33fbe4d5472679474bd Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 21 Nov 2023 20:15:24 +0100
Subject: [PATCH 15/24] net: phy: marvell10g: Fix power-up when strapped to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2c99fab374153c7eac6ba9874d47367871cec640 Mon Sep 17 00:00:00 2001
From 5f54194131bd332054da0a9143efc4423dac32b7 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 15 Nov 2023 20:58:42 +0100
Subject: [PATCH 16/24] net: phy: marvell10g: Add LED support for 88X3310
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6dd8ed1ea83d55469e20b9c13b41810fc2e29af4 Mon Sep 17 00:00:00 2001
From 5a82579e304de13e3590cc7ff8c212781a82253e Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 12 Dec 2023 09:51:05 +0100
Subject: [PATCH 17/24] net: phy: marvell10g: Support LEDs tied to a single
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 17cfde24d88c30c303659f2d8f488c2717592422 Mon Sep 17 00:00:00 2001
From 3d5cf4c863ab9bb4d72ac8e1f1f9fc48733e43c5 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 27 Mar 2024 10:10:19 +0100
Subject: [PATCH 18/24] net: phy: Do not resume PHY when attaching
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c75c32e677f22caf857981d1c8a3f580bf367230 Mon Sep 17 00:00:00 2001
From 70f0a5d1576e4218af1f507c442f4317947ba992 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Mon, 4 Mar 2024 16:47:28 +0100
Subject: [PATCH 19/24] net: bridge: avoid classifying unknown multicast as
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d8c84564a7ef2a5faf4caf76ed797131967258bb Mon Sep 17 00:00:00 2001
From f8dc202bdbe82e84d141c955c463aea6a871db37 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Tue, 5 Mar 2024 06:44:41 +0100
Subject: [PATCH 20/24] net: bridge: Ignore router ports when forwarding L2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bc2cbf4dd3c5a756e949f6abe7ffc7fe16e499d6 Mon Sep 17 00:00:00 2001
From abc00ff91772830a68abdcb4135ab5bd674599a8 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Thu, 4 Apr 2024 16:36:30 +0200
Subject: [PATCH 21/24] net: bridge: drop delay for applying strict multicast
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 65bf34b0195259808333b8fa7b53b8f588c58f32 Mon Sep 17 00:00:00 2001
From b2976eada955720555702d3ec70d381acc415adf Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 May 2024 14:51:54 +0200
Subject: [PATCH 22/24] net: bridge: Differentiate MDB additions from
Expand Down Expand Up @@ -30,7 +30,7 @@ Signed-off-by: Tobias Waldekranz <[email protected]>
3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 3b687d20c9ed..c459cddb1e97 100644
index db7254d52d93..63508279df47 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -134,6 +134,8 @@ enum {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9a15a9276f0bc1fd10c74ebb244e615af3f60880 Mon Sep 17 00:00:00 2001
From a449d4073cf045a8dbaa4d134f483c7c479a4fcb Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Fri, 24 Nov 2023 23:29:55 +0100
Subject: [PATCH 23/24] nvmem: layouts: onie-tlv: Let device probe even when
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 867929d898d12c8322091352cc8b59da77032e3f Mon Sep 17 00:00:00 2001
From 3166577344620658f8aae9b9af765401fecff87a Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Mon, 29 Apr 2024 15:14:51 +0200
Subject: [PATCH 24/24] usb: core: adjust log level for unauthorized devices
Expand Down

0 comments on commit 219c610

Please sign in to comment.