Skip to content

Commit 171b757

Browse files
authored
Merge pull request #1206 from kernelkit/upgrade-kernel
Upgrade Linux kernel to 6.12.55 (LTS)
2 parents 18d1773 + 2903f6f commit 171b757

File tree

37 files changed

+98
-98
lines changed

37 files changed

+98
-98
lines changed

configs/aarch64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2828
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
31-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
3232
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3333
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3434
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_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
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/r2s_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
2929
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
3030
BR2_LINUX_KERNEL=y
3131
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
32-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
32+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
3333
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
3434
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3535
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"

configs/x86_64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3333
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
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

doc/ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ All notable changes to the project are documented in this file.
99
### Changes
1010

1111
- Upgrade Buildroot to 2025.02.7 (LTS)
12-
- Upgrade Linux kernel to 6.12.54 (LTS)
12+
- Upgrade Linux kernel to 6.12.55 (LTS)
1313
- Extend NETCONF and RESTCONF scripting documentation with operational
1414
data examples, discovery patterns, and common workflow examples, issue #1156
1515
- Initial support for a zone-based firewall, based on `firewalld`, issue #448

patches/linux/6.12.54/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch renamed to patches/linux/6.12.55/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 038580d5a1629ee6b87a4fce58b57f16c003063e Mon Sep 17 00:00:00 2001
1+
From 98b8e71b03266a3e17b00562eea1a0e5951b0843 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Tue, 12 Mar 2024 10:27:24 +0100
44
Subject: [PATCH 01/30] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
@@ -13,7 +13,7 @@ register 0, bit 15). Therefore, increase the timeout threshold to 1s.
1313
1 file changed, 1 insertion(+), 1 deletion(-)
1414

1515
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
16-
index 211c219dd52db..d64c3eef4447a 100644
16+
index 211c219dd52d..d64c3eef4447 100644
1717
--- a/drivers/net/dsa/mv88e6xxx/chip.c
1818
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
1919
@@ -86,7 +86,7 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val)

patches/linux/6.12.54/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch renamed to patches/linux/6.12.55/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9b9c52ca8b20f3ff114217f1ef3399730e079568 Mon Sep 17 00:00:00 2001
1+
From d898868df98ef351f0dcc98f4069f333e89bc862 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 27 Mar 2024 15:52:43 +0100
44
Subject: [PATCH 02/30] net: dsa: mv88e6xxx: Improve indirect register access
@@ -22,7 +22,7 @@ other accesses use the regular indirect interface.
2222
5 files changed, 119 insertions(+)
2323

2424
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
25-
index d64c3eef4447a..47138492885e6 100644
25+
index d64c3eef4447..47138492885e 100644
2626
--- a/drivers/net/dsa/mv88e6xxx/chip.c
2727
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
2828
@@ -6539,6 +6539,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
@@ -40,7 +40,7 @@ index d64c3eef4447a..47138492885e6 100644
4040
chip->info->prod_num, chip->info->name, rev);
4141

4242
diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h
43-
index 3dbb7a1b8fe11..5ea956aadecc9 100644
43+
index 3dbb7a1b8fe1..5ea956aadecc 100644
4444
--- a/drivers/net/dsa/mv88e6xxx/global1.h
4545
+++ b/drivers/net/dsa/mv88e6xxx/global1.h
4646
@@ -218,6 +218,9 @@
@@ -54,7 +54,7 @@ index 3dbb7a1b8fe11..5ea956aadecc9 100644
5454
#define MV88E6XXX_G1_CTL2 0x1c
5555
#define MV88E6185_G1_CTL2_CASCADE_PORT_MASK 0xf000
5656
diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
57-
index 82f9b410de0b8..3663645621c9d 100644
57+
index 82f9b410de0b..3663645621c9 100644
5858
--- a/drivers/net/dsa/mv88e6xxx/global2.h
5959
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
6060
@@ -143,6 +143,9 @@
@@ -68,7 +68,7 @@ index 82f9b410de0b8..3663645621c9d 100644
6868
#define MV88E6XXX_G2_EEPROM_CMD 0x14
6969
#define MV88E6XXX_G2_EEPROM_CMD_BUSY 0x8000
7070
diff --git a/drivers/net/dsa/mv88e6xxx/smi.c b/drivers/net/dsa/mv88e6xxx/smi.c
71-
index a990271b74823..f54bb0e79030c 100644
71+
index a990271b7482..f54bb0e79030 100644
7272
--- a/drivers/net/dsa/mv88e6xxx/smi.c
7373
+++ b/drivers/net/dsa/mv88e6xxx/smi.c
7474
@@ -8,6 +8,8 @@
@@ -169,7 +169,7 @@ index a990271b74823..f54bb0e79030c 100644
169169
chip->smi_ops = &mv88e6xxx_smi_indirect_ops;
170170
else
171171
diff --git a/drivers/net/dsa/mv88e6xxx/smi.h b/drivers/net/dsa/mv88e6xxx/smi.h
172-
index c6c71d5757f5d..788cf68b7b334 100644
172+
index c6c71d5757f5..788cf68b7b33 100644
173173
--- a/drivers/net/dsa/mv88e6xxx/smi.h
174174
+++ b/drivers/net/dsa/mv88e6xxx/smi.h
175175
@@ -31,6 +31,36 @@

patches/linux/6.12.54/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch renamed to patches/linux/6.12.55/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0dff719628a25882eae67030643ba2c674460d04 Mon Sep 17 00:00:00 2001
1+
From b7774886dbfa5e888e482149430e0cebf485558a Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Mon, 22 Apr 2024 23:18:01 +0200
44
Subject: [PATCH 03/30] net: dsa: mv88e6xxx: Honor ports being managed via
@@ -18,7 +18,7 @@ when in-band-status is being used.
1818
1 file changed, 6 insertions(+)
1919

2020
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
21-
index 47138492885e6..b96bc12dc6a86 100644
21+
index 47138492885e..b96bc12dc6a8 100644
2222
--- a/drivers/net/dsa/mv88e6xxx/chip.c
2323
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
2424
@@ -964,6 +964,9 @@ static void mv88e6xxx_mac_link_down(struct phylink_config *config,

patches/linux/6.12.54/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch renamed to patches/linux/6.12.55/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ea15c57ab036135e2168e49796c355c9c64bb205 Mon Sep 17 00:00:00 2001
1+
From 97e3384bea3c0cc553c6158c35759e3cc60b9f70 Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 24 Apr 2024 22:41:04 +0200
44
Subject: [PATCH 04/30] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
@@ -34,7 +34,7 @@ forwarded like any other.
3434
1 file changed, 25 insertions(+), 6 deletions(-)
3535

3636
diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
37-
index 04053fdc6489a..f25fb3214acb9 100644
37+
index 04053fdc6489..f25fb3214acb 100644
3838
--- a/drivers/net/dsa/mv88e6xxx/port.c
3939
+++ b/drivers/net/dsa/mv88e6xxx/port.c
4040
@@ -1432,6 +1432,23 @@ static int mv88e6393x_port_policy_write_all(struct mv88e6xxx_chip *chip,

0 commit comments

Comments
 (0)