Skip to content

Commit 8d647a8

Browse files
authored
Merge pull request #1408 from kernelkit/kernel-upgrade-5201d390-057f-48d7-84f8-8c48fe75926d
2 parents 5c0a4c0 + 6fee172 commit 8d647a8

41 files changed

Lines changed: 110 additions & 72 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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.12"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
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_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.12"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
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/arm_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2828
BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
31-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.12"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
3232
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3333
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
3434
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/arm_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
2828
BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
31-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.12"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
3232
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3333
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
3434
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.12"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
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.12"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.13"
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ All notable changes to the project are documented in this file.
88

99
### Changes
1010

11-
- Upgrade Linux kernel to 6.18.12 (LTS)
11+
- Upgrade Linux kernel to 6.18.13 (LTS)
1212
- Add support for Microchip SAMA7G54-EK Evaluation Kit, Arm Cortex-A7
1313
- Add GPS/GNSS receiver support with NTP reference clock integration
1414

patches/linux/6.18.12/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch renamed to patches/linux/6.18.13/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 01751f673257c278d680e0a056cdbdc548e67beb Mon Sep 17 00:00:00 2001
1+
From d7709271a7c36d717431ab8249011c2701ea4309 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Tue, 19 Sep 2023 18:38:10 +0200
4-
Subject: [PATCH 01/32] net: phy: marvell10g: Support firmware loading on
4+
Subject: [PATCH 01/33] 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.12/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch renamed to patches/linux/6.18.13/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 dbbbb56c90017036b58b9a30bd656341d193f2df Mon Sep 17 00:00:00 2001
1+
From 01102726c15b1424517ab281b05e036c2bb92c13 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Tue, 21 Nov 2023 20:15:24 +0100
4-
Subject: [PATCH 02/32] net: phy: marvell10g: Fix power-up when strapped to
4+
Subject: [PATCH 02/33] 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.12/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch renamed to patches/linux/6.18.13/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 756b69798263b8dfb7b5fcef5c69ae2d8b2d352c Mon Sep 17 00:00:00 2001
1+
From b1808e8ec0edaba33e3672ed8310f2c007619b12 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Wed, 15 Nov 2023 20:58:42 +0100
4-
Subject: [PATCH 03/32] net: phy: marvell10g: Add LED support for 88X3310
4+
Subject: [PATCH 03/33] 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)