From 18447d0afdbcc8fa7db6ae008e4bc4d5b0a0b00a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 15 Aug 2025 19:09:30 +0400 Subject: [PATCH] feat: update Linux to 6.12.41 Also brings in other Linux kernel changes: * https://github.com/siderolabs/pkgs/pull/1293 * https://github.com/siderolabs/pkgs/pull/1299 * https://github.com/siderolabs/pkgs/pull/1300 * https://github.com/siderolabs/pkgs/pull/1301 Signed-off-by: Andrey Smirnov --- Makefile | 2 +- hack/modules-amd64.txt | 1 + hack/modules-arm64.txt | 1 + hack/release.toml | 2 +- pkg/machinery/constants/constants.go | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- website/content/v1.11/introduction/what-is-new/index.md | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5cc02e0e3..5d2a0765e 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ EMBED_TARGET ?= embed TOOLS_PREFIX ?= ghcr.io/siderolabs/tools TOOLS ?= v1.12.0-alpha.0-1-g52db66e PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.12.0-alpha.0-4-gd5f7467 +PKGS ?= v1.12.0-alpha.0-8-g0edf426 GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex GENERATE_VEX ?= latest diff --git a/hack/modules-amd64.txt b/hack/modules-amd64.txt index 4ae22ae97..58f73394c 100644 --- a/hack/modules-amd64.txt +++ b/hack/modules-amd64.txt @@ -69,6 +69,7 @@ kernel/drivers/i2c/i2c-smbus.ko kernel/drivers/infiniband/core/ib_umad.ko kernel/drivers/infiniband/core/ib_uverbs.ko kernel/drivers/infiniband/core/rdma_ucm.ko +kernel/drivers/infiniband/hw/irdma/irdma.ko kernel/drivers/infiniband/hw/mlx4/mlx4_ib.ko kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt index f2215167c..1dbd07f78 100644 --- a/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt @@ -49,6 +49,7 @@ kernel/drivers/infiniband/core/ib_umad.ko kernel/drivers/infiniband/core/ib_uverbs.ko kernel/drivers/infiniband/core/rdma_ucm.ko kernel/drivers/infiniband/hw/hns/hns-roce-hw-v2.ko +kernel/drivers/infiniband/hw/irdma/irdma.ko kernel/drivers/infiniband/hw/mlx4/mlx4_ib.ko kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko diff --git a/hack/release.toml b/hack/release.toml index c6459a73d..b6b6ebaeb 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -18,7 +18,7 @@ preface = """ [notes.updates] title = "Component Updates" description = """\ -Linux: 6.12.40 +Linux: 6.12.41 Kubernetes: 1.34.0-rc.1 runc: 1.3.0 etcd: 3.6.4 diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 9ae44fb2c..027720dd4 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -14,7 +14,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.12.40-talos" + DefaultKernelVersion = "6.12.41-talos" // KernelParamConfig is the kernel parameter name for specifying the URL. // to the config. diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index a53970cd8..66ca7f444 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.12.0-alpha.0-4-gd5f7467 \ No newline at end of file +v1.12.0-alpha.0-8-g0edf426 \ No newline at end of file diff --git a/website/content/v1.11/introduction/what-is-new/index.md b/website/content/v1.11/introduction/what-is-new/index.md index 90839b890..4a0ec68b1 100644 --- a/website/content/v1.11/introduction/what-is-new/index.md +++ b/website/content/v1.11/introduction/what-is-new/index.md @@ -98,7 +98,7 @@ The value of this parameter has same format as the `talos.config.inline` paramet ## Component Updates -* Linux: 6.12.40 +* Linux: 6.12.41 * Kubernetes: 1.34.0-rc.1 * runc: 1.3.0 * etcd: 3.6.4