Skip to content

Commit 03b4466

Browse files
authored
Merge pull request #1443 from kernelkit/kernel-upgrade
Upgrade Linux kernel to 6.18.17 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
2 parents b9cbbb0 + a1903a8 commit 03b4466

41 files changed

Lines changed: 79 additions & 46 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.16"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.17"
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.16 (LTS)
11+
- Upgrade Linux kernel to 6.18.17 (LTS)
1212
- Add support for [Banana Pi R64 Mini][BPI-R64], 5 port router with WiFi 5
1313
- Add support for [Raspberry Pi 400][RPI-400], an RPi 4B built into a keyboard
1414
- **Revamped <http://network.local> device browser**. Device cards now

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
From 2ca55761d22dbc39d26862cf94577cf44f4b85a0 Mon Sep 17 00:00:00 2001
1+
From 346def32eb16c04f267c1da13735945c9a54231f Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Tue, 19 Sep 2023 18:38:10 +0200
44
Subject: [PATCH 01/33] net: phy: marvell10g: Support firmware loading on
55
88X3310
6+
Organization: Wires
67

78
When probing, if a device is waiting for firmware to be loaded into
89
its RAM, ask userspace for the binary and load it over XMDIO.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
From 554729f2a8c83f617663c097cc389b5c791db8aa Mon Sep 17 00:00:00 2001
1+
From 77b517d44bdffdf6b34e6349c1dd2fa3b82f8a49 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Tue, 21 Nov 2023 20:15:24 +0100
44
Subject: [PATCH 02/33] net: phy: marvell10g: Fix power-up when strapped to
55
start powered down
6+
Organization: Wires
67

78
On devices which are hardware strapped to start powered down (PDSTATE
89
== 1), make sure that we clear the power-down bit on all units

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
From 7090bf6cbf332d9a38e04a58b026d2d00701ca67 Mon Sep 17 00:00:00 2001
1+
From 9e51a2fa9f7aa8bace041a943b517faa47f30624 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <tobias@waldekranz.com>
33
Date: Wed, 15 Nov 2023 20:58:42 +0100
44
Subject: [PATCH 03/33] net: phy: marvell10g: Add LED support for 88X3310
5+
Organization: Wires
56

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

0 commit comments

Comments
 (0)