Skip to content

Commit 26c005f

Browse files
authored
Merge pull request #1235 from kernelkit/kernel-upgrade-4868c760-a6f5-4534-829b-401bd6b5363b
Upgrade to kernel 6.12.57
2 parents 4b3ee0f + a832dfe commit 26c005f

File tree

36 files changed

+36
-65
lines changed

36 files changed

+36
-65
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.56"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57"
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.56"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57"
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
@@ -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.56"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57"
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.56"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57"
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: 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.57 (LTS)
1112
- Improvements to `sdcard.img` generation, useful for developers mostly:
1213
- The NanoPi R2S bootloader is now automatically built and uploaded to
1314
the [`latest-boot` release][lastest-boot] tag

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From 52f290cad56b362568c210dbcb5b64362b87585c Mon Sep 17 00:00:00 2001
1+
From d532420003a86f60cb632662bf5a415904a6ceb0 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
55
PPU on 6393X
6-
Organization: Wires
76

87
In a multi-chip setup, delays of up to 750ms are observed before the
98
device (6393X) signals completion of PPU initialization (Global 1,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From c4317d637f4cfb2905be011becf0f822c7a83b6b Mon Sep 17 00:00:00 2001
1+
From dfdfe4261ef01baa9952ec157e73a7823623a8f5 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
55
perf on 6393
6-
Organization: Wires
76

87
When operating in multi-chip mode, the 6393 family maps a subset of
98
commonly used global registers to the outermost address space (in

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From cb5f94c0fedcf97fc7d6a52b64b534150bffa82a Mon Sep 17 00:00:00 2001
1+
From 80a9ba5efce93eb9a9379467697b175aa17698ee 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
55
in-band-status
6-
Organization: Wires
76

87
Keep all link parameters in their unforced states when the port is
98
declared as being managed via in-band-status, and let the MAC

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From f94a92a11b277a3a398b2611024b523bb5188c77 Mon Sep 17 00:00:00 2001
1+
From 1863c3b6e78fd3a48f144383cd3e950a5078ad9c 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
55
ports on 6393X
6-
Organization: Wires
76

87
For packets with a DA in the IEEE reserved L2 group range, originating
98
from a CPU, forward it as normal, rather than classifying it as

patches/linux/6.12.56/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch renamed to patches/linux/6.12.57/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
From cc2ba799c885e9cfbbb45bb6678ceca5cc4901e1 Mon Sep 17 00:00:00 2001
1+
From 497d566762ef702eea234ef4d571a2378385bc21 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
5-
Organization: Wires
65

76
Parse DT for LEDs and register them for devices that support it,
87
though no actual implementations exist yet.

0 commit comments

Comments
 (0)