Skip to content

Commit eb7c031

Browse files
authored
Merge pull request #1332 from kernelkit/kernel-v25.02.x
Bump kernel and update ChangeLog for v25.08.2
2 parents 96fad20 + 1d23f73 commit eb7c031

File tree

36 files changed

+63
-36
lines changed

36 files changed

+63
-36
lines changed

configs/aarch64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.44"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.63"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/aarch64_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.44"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.63"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2626
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2727
BR2_LINUX_KERNEL=y
2828
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
29-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.44"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.63"
3030
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3131
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3232
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.44"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.63"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

doc/ChangeLog.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@ Change Log
33

44
All notable changes to the project are documented in this file.
55

6+
[v25.08.2][] - 2025-12-19
7+
-------------------------
8+
9+
### Changes
10+
11+
- Upgrade Linux kernel to 6.12.63 (LTS)
12+
- Enable workaround for issue #670 by disabling iitod on styx platform. This
13+
prohibits software control of LEDs, leaving the default HW control, which
14+
has proven more stable on this platform
15+
- Add support for configurable OSPF debug logging, issue #1281. Debug options
16+
can now be enabled per category (bfd, packet, ism, nsm, default-information,
17+
nssa). All debug options are disabled by default to prevent log flooding in
18+
production environments. See the documentation for usage examples
19+
- Add support data collection script, useful when troubleshooting issues on
20+
deployed systems. Gathers system information, logs, and more. Issue #1287
21+
- Enable kernel panic on lockups + hung tasks => console log + reboot. Also,
22+
enable watchdogd resource monitors, logs: memory/file system + descriptor
23+
usage. Issue #1318
24+
- Enable CN9130 HW watchdog, and kernel `test_lockup` module, issue #1320
25+
26+
### Fixes
27+
28+
- Fix #981: copying any file, including `running-config`, to the persistent
29+
back-end store for `startup-config`, does not take
30+
- Fix #1203: copying any file, including `startup-config`, to `running-config`
31+
does not take
32+
633
[v25.08.1][] - 2025-10-03
734
-------------------------
835

patches/linux/6.12.44/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch renamed to patches/linux/6.12.63/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b4f8d056cfbf3af9116952f5f03ed2bfba13fcbb Mon Sep 17 00:00:00 2001
1+
From c325dce2343f549b188f050ed6cc1fb6bdad824d Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Tue, 12 Mar 2024 10:27:24 +0100
44
Subject: [PATCH 01/30] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for

patches/linux/6.12.44/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch renamed to patches/linux/6.12.63/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b9bf83b003601dc306d3a2cd7dd51f2795bbb451 Mon Sep 17 00:00:00 2001
1+
From 1e235f31e3a37e1077a31136f9f1cbfcc41e2d1a Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 27 Mar 2024 15:52:43 +0100
44
Subject: [PATCH 02/30] net: dsa: mv88e6xxx: Improve indirect register access

patches/linux/6.12.44/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch renamed to patches/linux/6.12.63/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c6171e8b4f0a7acb1a8d57e9fe8900e132917e82 Mon Sep 17 00:00:00 2001
1+
From 4cde6e8574c27bf2d1bb397c575e1d3a6d7c6e59 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Mon, 22 Apr 2024 23:18:01 +0200
44
Subject: [PATCH 03/30] net: dsa: mv88e6xxx: Honor ports being managed via

patches/linux/6.12.44/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch renamed to patches/linux/6.12.63/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8138197f76730926e96d94b532d0215de20470af Mon Sep 17 00:00:00 2001
1+
From 19290bb9a333978f38cf5790b5b568b2edae7824 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 24 Apr 2024 22:41:04 +0200
44
Subject: [PATCH 04/30] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user

patches/linux/6.12.44/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch renamed to patches/linux/6.12.63/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a02245c2aa6783aae016266ef3f226f85bf402da Mon Sep 17 00:00:00 2001
1+
From 8a6823163110439b57cb88b9a370148fa34c6cd9 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Thu, 16 Nov 2023 19:44:32 +0100
44
Subject: [PATCH 05/30] net: dsa: mv88e6xxx: Add LED infrastructure

0 commit comments

Comments
 (0)