Skip to content

Commit a06786d

Browse files
authored
Merge pull request #1475 from kernelkit/kernel-upgrade-dfbe850e-9e05-4f30-b9b5-bd9399c6b718
Upgrade to kernel 6.18.23
2 parents 6c38666 + 16a173e commit a06786d

56 files changed

Lines changed: 285 additions & 102 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.22"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.23"
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.22 (LTS)
11+
- Upgrade Linux kernel to 6.18.23 (LTS)
1212
- Add support for [Banana Pi BPI-R4][BPI-R4], quad-core Cortex-A73 router with
1313
4x 2.5 GbE switching, dual 10 GbE SFP+. Variants BPI-R4-2g5 and BPI-R4P have
1414
one SFP+ replaced by a 2.5 GbE RJ45, with optional PoE on the R4P

patches/linux/6.18.22/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch renamed to patches/linux/6.18.23/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 e9bd1bc3cafef4c1f0cb11ed8638eed50794d31a Mon Sep 17 00:00:00 2001
1+
From 1468d842d2266521b56a2f41b82de6a6de973b9b 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/47] net: phy: marvell10g: Support firmware loading on
4+
Subject: [PATCH 01/48] 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.22/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch renamed to patches/linux/6.18.23/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 a438252db8621e406e2e3bfd82c4349820315bdf Mon Sep 17 00:00:00 2001
1+
From ee5e5f2240b08fed5e8c3c49ffe257123c3def3f 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/47] net: phy: marvell10g: Fix power-up when strapped to
4+
Subject: [PATCH 02/48] 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.22/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch renamed to patches/linux/6.18.23/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 d0b9c6e92f1a037f380437cef703a6015c63826a Mon Sep 17 00:00:00 2001
1+
From fcb3a86d1c629b19927184668f437ea26c0a9f46 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/47] net: phy: marvell10g: Add LED support for 88X3310
4+
Subject: [PATCH 03/48] 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)