Skip to content

Commit 1774e08

Browse files
troglobittroglobit
authored
Merge pull request #1471 from kernelkit/kernel-upgrade-f52bac45-222b-4dda-86d4-50b617297422
2 parents fadffef + 5950e66 commit 1774e08

55 files changed

Lines changed: 170 additions & 243 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.21"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21"
29+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.22"
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.21 (LTS)
11+
- Upgrade Linux kernel to 6.18.22 (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.21/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch renamed to patches/linux/6.18.22/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From 657a79b59e67bac4af66f63bcf740238af399aba Mon Sep 17 00:00:00 2001
1+
From e9bd1bc3cafef4c1f0cb11ed8638eed50794d31a 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/41] net: phy: marvell10g: Support firmware loading on
4+
Subject: [PATCH 01/47] net: phy: marvell10g: Support firmware loading on
55
88X3310
6-
Organization: Wires
76

87
When probing, if a device is waiting for firmware to be loaded into
98
its RAM, ask userspace for the binary and load it over XMDIO.
@@ -16,7 +15,7 @@ fall back.
1615
1 file changed, 161 insertions(+)
1716

1817
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
19-
index 8fd42131cdbf9..44294519231ed 100644
18+
index 8fd42131cdbf..44294519231e 100644
2019
--- a/drivers/net/phy/marvell10g.c
2120
+++ b/drivers/net/phy/marvell10g.c
2221
@@ -25,6 +25,7 @@

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
From 6684303b2262468f91f4aab0755a35f8dc2ee141 Mon Sep 17 00:00:00 2001
1+
From a438252db8621e406e2e3bfd82c4349820315bdf 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/41] net: phy: marvell10g: Fix power-up when strapped to
4+
Subject: [PATCH 02/47] net: phy: marvell10g: Fix power-up when strapped to
55
start powered down
6-
Organization: Wires
76

87
On devices which are hardware strapped to start powered down (PDSTATE
98
== 1), make sure that we clear the power-down bit on all units
@@ -13,7 +12,7 @@ affected by this setting.
1312
1 file changed, 15 insertions(+), 3 deletions(-)
1413

1514
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
16-
index 44294519231ed..40439db49601d 100644
15+
index 44294519231e..40439db49601 100644
1716
--- a/drivers/net/phy/marvell10g.c
1817
+++ b/drivers/net/phy/marvell10g.c
1918
@@ -322,11 +322,23 @@ static int mv3310_power_down(struct phy_device *phydev)

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
From ee1464a4becdb06df87ae167fb56d9ac1530512f Mon Sep 17 00:00:00 2001
1+
From d0b9c6e92f1a037f380437cef703a6015c63826a 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/41] net: phy: marvell10g: Add LED support for 88X3310
5-
Organization: Wires
4+
Subject: [PATCH 03/47] net: phy: marvell10g: Add LED support for 88X3310
65

76
Pickup the LEDs from the state in which the hardware reset or
87
bootloader left them, but also support further configuration via
@@ -22,7 +21,7 @@ Trigger support:
2221
1 file changed, 422 insertions(+)
2322

2423
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
25-
index 40439db49601d..7ae4744f147bb 100644
24+
index 40439db49601..7ae4744f147b 100644
2625
--- a/drivers/net/phy/marvell10g.c
2726
+++ b/drivers/net/phy/marvell10g.c
2827
@@ -28,6 +28,7 @@

0 commit comments

Comments
 (0)