Skip to content

Commit d9af63c

Browse files
authored
Merge pull request #1311 from kernelkit/kernel-upgrade-077cf354-823d-43ad-b980-6022549c60dc
Upgrade to kernel 6.12.61
2 parents 6fafafc + 9044aef commit d9af63c

File tree

36 files changed

+36
-35
lines changed

36 files changed

+36
-35
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_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2727
BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.60"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.61"
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
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2626
BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2727
BR2_LINUX_KERNEL=y
2828
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
29-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.60"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.61"
3030
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3131
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3232
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_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2626
BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2727
BR2_LINUX_KERNEL=y
2828
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
29-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.60"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.61"
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
@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2626
BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2727
BR2_LINUX_KERNEL=y
2828
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
29-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.60"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.61"
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

doc/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ All notable changes to the project are documented in this file.
88

99
### Changes
1010

11+
- Upgrade Linux kernel to 6.12.61 (LTS)
1112
- Add RIPv2 routing support, issue #582
1213
- Add support for configurable OSPF debug logging, issue #1281. Debug options
1314
can now be enabled per category (bfd, packet, ism, nsm, default-information,

patches/linux/6.12.60/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch renamed to patches/linux/6.12.61/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 83cd7a46ae0346e1cbf2872ff251e9c72bf5dc7f Mon Sep 17 00:00:00 2001
1+
From 8c982a391f0b2e21e25552d7daa592b12368c76b Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
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.60/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch renamed to patches/linux/6.12.61/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 b9e507bb66c93910a1ee2576b6073e807d0dee2e Mon Sep 17 00:00:00 2001
1+
From dad4553127023de69d13565a34a8f32c14013da6 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
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.60/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch renamed to patches/linux/6.12.61/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 a08a351c076eb52d49caa8e73335fe9b402bd460 Mon Sep 17 00:00:00 2001
1+
From a0829c84c0eb2e4bc4758ef5e2be5d267fa7626e Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
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.60/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch renamed to patches/linux/6.12.61/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 5250f7348511e6f8e6b0cd30581968fc8ea0e9af Mon Sep 17 00:00:00 2001
1+
From e32883eed619bc3eab8ad848c085fc29bafaf83a Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
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.60/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch renamed to patches/linux/6.12.61/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 8fb81be5838aacbfb32f2c947826a8917a14f673 Mon Sep 17 00:00:00 2001
1+
From 764be1a05c3411b8e369d089d4302f7b670602e8 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
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)