Skip to content

Commit 701dcda

Browse files
authored
Merge pull request #1181 from kernelkit/upgrade-kernel
Upgrade Linux kernel to 6.12.50 (LTS)
2 parents ebb3773 + 3cc7923 commit 701dcda

File tree

37 files changed

+46
-36
lines changed

37 files changed

+46
-36
lines changed

configs/aarch64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2828
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
31-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.49"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50"
3232
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3333
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3434
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.49"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50"
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/r2s_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
2929
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
3030
BR2_LINUX_KERNEL=y
3131
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
32-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.49"
32+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50"
3333
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
3434
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3535
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"

configs/x86_64_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.49"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50"
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

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.49"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.50"
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ Change Log
33

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

6+
[v25.10.0][UNRELEASED] -
7+
-------------------------
8+
9+
### Changes
10+
11+
- Upgrade Linux kernel to 6.12.50 (LTS)
12+
13+
### Fixes
14+
15+
616
[v25.09.0][] - 2025-09-30
717
-------------------------
818

patches/linux/6.12.49/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch renamed to patches/linux/6.12.50/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 0d406c0c6e18b6e250dea14a5ca2dde88c0c812e Mon Sep 17 00:00:00 2001
1+
From c50a09f0ee6ec92d1cbf81a83378277418c947b2 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.49/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch renamed to patches/linux/6.12.50/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 bcbdeaf83c25d999ccb6354313d764dc84b2ee08 Mon Sep 17 00:00:00 2001
1+
From fc07145378cf7178c462b8be309066a1076e4709 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.49/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch renamed to patches/linux/6.12.50/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 fb2d1ea785d511507e2bc8f2632c6c0139dc64cf Mon Sep 17 00:00:00 2001
1+
From 5ac476c5a460fa05c957bdabcd5b8b9d9b7b08f4 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.49/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch renamed to patches/linux/6.12.50/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 caccfd3b07e97d55293118bb36684fed66704899 Mon Sep 17 00:00:00 2001
1+
From 8d4e2847b3ec0667f596923e26e8c6eda89a2b70 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

0 commit comments

Comments
 (0)