Skip to content

Commit 0432d7f

Browse files
authored
Merge pull request #1365 from kernelkit/kernel-upgrade-aac2140b-4090-400b-807d-7bb87a0ce54d
Upgrade to kernel 6.18.7
2 parents d19201e + b683b37 commit 0432d7f

File tree

40 files changed

+88
-98
lines changed

40 files changed

+88
-98
lines changed

configs/aarch32_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2929
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
3030
BR2_LINUX_KERNEL=y
3131
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
32-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6"
32+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
3333
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3434
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig"
3535
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/aarch32_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2929
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
3030
BR2_LINUX_KERNEL=y
3131
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
32-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6"
32+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
3333
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3434
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig"
3535
BR2_LINUX_KERNEL_INSTALL_TARGET=y

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.18.6"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
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.18.6"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
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.18.6"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
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.18.6"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7"
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
@@ -21,6 +21,7 @@ All notable changes to the project are documented in this file.
2121
2222
### Changes
2323

24+
- Upgrade Linux kernel to 6.18.7 (LTS)
2425
Noteworthy changes and additions in this release are marked below in bold text.
2526

2627
- Upgrade **Linux kernel to 6.18.6** (LTS)

patches/linux/6.18.6/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch renamed to patches/linux/6.18.7/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 257b51fcd94ca99b13555354327ce2dbaaba4003 Mon Sep 17 00:00:00 2001
1+
From 0da46e7eaa8896066c9ef549ee6ff95a713285f7 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Tue, 19 Sep 2023 18:38:10 +0200
4-
Subject: [PATCH 01/30] net: phy: marvell10g: Support firmware loading on
4+
Subject: [PATCH 01/32] net: phy: marvell10g: Support firmware loading on
55
88X3310
66

77
When probing, if a device is waiting for firmware to be loaded into

patches/linux/6.18.6/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch renamed to patches/linux/6.18.7/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 7cb0e3b358c7d9118e179e2e0684ec66bed1ba18 Mon Sep 17 00:00:00 2001
1+
From 6ca7c41f05512829625df7f89c9cedfa8fce4954 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Tue, 21 Nov 2023 20:15:24 +0100
4-
Subject: [PATCH 02/30] net: phy: marvell10g: Fix power-up when strapped to
4+
Subject: [PATCH 02/32] net: phy: marvell10g: Fix power-up when strapped to
55
start powered down
66

77
On devices which are hardware strapped to start powered down (PDSTATE

patches/linux/6.18.6/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch renamed to patches/linux/6.18.7/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From e12b368dfff77e0741cb3d9d7636ec4dfbbfd0f9 Mon Sep 17 00:00:00 2001
1+
From 4ddca512b7f01fc8a3296b04252552e78d3aa084 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 15 Nov 2023 20:58:42 +0100
4-
Subject: [PATCH 03/30] net: phy: marvell10g: Add LED support for 88X3310
4+
Subject: [PATCH 03/32] net: phy: marvell10g: Add LED support for 88X3310
55

66
Pickup the LEDs from the state in which the hardware reset or
77
bootloader left them, but also support further configuration via

0 commit comments

Comments
 (0)