From 22cd9b49b0d967e36c4d16e9095708555c44ded4 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 21 Dec 2023 18:52:15 +0400 Subject: [PATCH 1/4] chore: disable one commit check It's a backports branch. Signed-off-by: Andrey Smirnov --- .conform.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.conform.yaml b/.conform.yaml index 2fa80e8b9..3d0eeb974 100644 --- a/.conform.yaml +++ b/.conform.yaml @@ -8,7 +8,7 @@ policies: gitHubOrganization: siderolabs spellcheck: locale: US - maximumOfOneCommit: true + maximumOfOneCommit: false header: length: 89 imperative: true From 6fdc79abcdd2f86de6e479263285893ccd15ab3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 13 Dec 2023 20:17:37 +0100 Subject: [PATCH 2/4] feat: enable IRQ remapping on amd64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enables the IOMMU to do IRQ remapping besides DMA remapping which is required by some devices to function with IOMMU. Note IOMMU is disabled by default. Signed-off-by: Radosław Piliszek Signed-off-by: Andrey Smirnov (cherry picked from commit d6185ec3ad68e10a9545ca0528f7e517c803f1a8) --- kernel/build/config-amd64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index f0c2bf0cd..a8a86f630 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -4771,7 +4771,7 @@ CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_IRQ_REMAP is not set +CONFIG_IRQ_REMAP=y CONFIG_HYPERV_IOMMU=y # CONFIG_VIRTIO_IOMMU is not set From f36484ec1143586ea0e499dbc1b9d5bba7e8822d Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 14 Dec 2023 15:35:30 +0400 Subject: [PATCH 3/4] feat: update containerd to 1.7.11 See https://github.com/containerd/containerd/releases/tag/v1.7.11 Signed-off-by: Andrey Smirnov (cherry picked from commit 814dc601fb79e2b973d41e82cd16872dee513161) --- Pkgfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Pkgfile b/Pkgfile index a2cba5c3f..1dac1f643 100644 --- a/Pkgfile +++ b/Pkgfile @@ -11,10 +11,10 @@ vars: cni_sha512: 87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10 # renovate: datasource=github-tags depName=containerd/containerd - containerd_version: v1.7.10 - containerd_ref: 4e1fe7492b9df85914c389d1f15a3ceedbb280ac - containerd_sha256: dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd - containerd_sha512: b3e9f13ad981b7a9226c23dda3f6bfdc2267c78d549d033d1cab8c4b94c2e6d62025259e80bad23cacbe1a06b39c098d6d4d48414180c85ef61bbb46b9b261d0 + containerd_version: v1.7.11 + containerd_ref: 64b8a811b07ba6288238eefc14d898ee0b5b99ba + containerd_sha256: 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a + containerd_sha512: f621243dc86208e814942dbcf33484c3c897b01c6d538703d0b8c0c57c8950168ced59980dbaa46b87d66b67200fc37b171a83ea89962d6696eafbf8bff3a0bc # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git cryptsetup_version: 2.6.1 From 8fa73db461aaab2ad180baf08df3ceda8eae3454 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 21 Dec 2023 14:32:56 +0400 Subject: [PATCH 4/4] feat: update Linux to 6.1.69 Latest 6.1.x LTS. Signed-off-by: Andrey Smirnov (cherry picked from commit f647edd497852feb4d537d191ef895d33420b5c4) --- Pkgfile | 6 +++--- kernel/build/config-amd64 | 2 +- kernel/build/config-arm64 | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Pkgfile b/Pkgfile index 1dac1f643..64ee950bd 100644 --- a/Pkgfile +++ b/Pkgfile @@ -68,9 +68,9 @@ vars: ipxe_sha512: 00dc6f925e3b3f6a92b7b6fc1733a3c022b3af7c11b1c0dd8a36fb383a912fc3f7861fcafbaf385ef8f2bc41da147252ac329faf9c88bdc67d770446fc9bae99 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - linux_version: 6.1.67 - linux_sha256: 7537db7289ca4854a126bc1237c47c5b21784bcbf27b4e571d389e3528c59285 - linux_sha512: adbe4b5dc952eba848ce446547b07fa0eb1127f98051d4504aa2a533520cf96f6b135b2087b89e4a8b0eaf8172cf6f31fe49cca4cc594d75762ffebde62c53cb + linux_version: 6.1.69 + linux_sha256: 7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541 + linux_sha512: 70afe2642b58cb0a1a5b38867e00052b3236f7701d9d006f0d95c66f204935453e997bd8b4d28c890617e745e08610d39933ef0798ede13f230485a8222b9819 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git kmod_version: 31 diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index a8a86f630..25664a1f4 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.67 Kernel Configuration +# Linux/x86 6.1.69 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index df3ed98bd..9960b3997 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.67 Kernel Configuration +# Linux/arm64 6.1.69 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -2980,7 +2980,6 @@ CONFIG_DWMAC_SUNXI=y CONFIG_DWMAC_SUN8I=y CONFIG_DWMAC_IMX8=y # CONFIG_DWMAC_INTEL_PLAT is not set -# CONFIG_DWMAC_LOONGSON is not set CONFIG_STMMAC_PCI=y CONFIG_NET_VENDOR_SUN=y # CONFIG_HAPPYMEAL is not set