From d9c15407b5b32a7c3cec91b560f2306fd8438d14 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrey.smirnov@siderolabs.com>
Date: Wed, 28 Feb 2024 20:56:23 +0400
Subject: [PATCH] feat: update releases

Linux: 6.6.18
ZFS: 2.2.3 (should fix the Linux 6.6 build failure)
iPXE: bump to next main

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
---
 .github/renovate.json     |  2 +-
 .kres.yaml                |  3 +--
 Pkgfile                   | 18 +++++++++---------
 kernel/build/config-amd64 |  3 ++-
 kernel/build/config-arm64 |  3 ++-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index b2e69d19..446def13 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -35,7 +35,7 @@
             "matchPackageNames": [
                 "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
             ],
-            "allowedVersions": "<= 6.1"
+            "allowedVersions": "<= 6.6"
         },
         {
             "matchPackageNames": [
diff --git a/.kres.yaml b/.kres.yaml
index 0795fec1..6c528877 100644
--- a/.kres.yaml
+++ b/.kres.yaml
@@ -43,8 +43,7 @@ spec:
     # - drbd-pkg
     - gasket-driver-pkg
     - nvidia-open-gpu-kernel-modules-pkg
-    # disabled with Linux 6.6, should be fixed in zfs 2.2.3
-    # - zfs-pkg
+    - zfs-pkg
   additionalTargets:
     nonfree:
       - nonfree-kmod-nvidia-pkg
diff --git a/Pkgfile b/Pkgfile
index 577190e5..0c20c135 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -63,14 +63,14 @@ vars:
   iptables_sha512: 71e6ed2260859157d61981a4fe5039dc9e8d7da885a626a4b5dae8164c509a9d9f874286b9468bb6a462d6e259d4d32d5967777ecefdd8a293011ae80c00f153
 
   # renovate: datasource=git-refs versioning=git depName=https://github.com/ipxe/ipxe.git
-  ipxe_ref: 0cc0f47443ef9711775a748c2b0fb40e38643733
-  ipxe_sha256: f2614c571ae437e81ec8b8a3f7c0e85560c945ae45a76adfb3d819b73f6713c3
-  ipxe_sha512: d3abf08808a67990856876a18d54d9b2ea866bb8c9a020b1b72251cc017bc9d5df6f1c5e8ff4230716e7c277aeae1c91a7f3e7ad4c8e68b35a8e7659fcfcf3e4
+  ipxe_ref: 182ee909313fc60875d3f1741cd4a0bb7dfd15e1
+  ipxe_sha256: ed51605411e8830375e4a24dd420d2a95e60ae6adbbfc71aa7c998da2ec87b77
+  ipxe_sha512: e41713e441b3e463ee05f0b4ea73575052ca6eb07a81dc92b15fb61e1d766082b1be24f39236614a7c166e9a6b19870c918c85f1cda88e822ee2b2203aeae14c
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.6.16
-  linux_sha256: b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30
-  linux_sha512: 3823a776f8e4aefdec75dce7c959adcb038ab0776d8d7e60fb79626d2d9410c0a334df71b1cd10499ed9ba82d7e50cec415c3f2b821b33f53171ca00b1a3b7f1
+  linux_version: 6.6.18
+  linux_sha256: 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d
+  linux_sha512: 7453d9ae753345e9312ad01da7805f68c1fb04f33aaec58ac3ba08e4b7af132c19e1822d8635fb747eb2d72cc8d89c89f3e5b7ff2e2207903cb2eb8b7dc5e884
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 31
@@ -189,8 +189,8 @@ vars:
   xfsprogs_sha512: 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739
 
   # renovate: datasource=github-tags extractVersion=^zfs-(?<version>.*)$ depName=openzfs/zfs
-  zfs_version: 2.2.2
-  zfs_sha256: 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
-  zfs_sha512: bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
+  zfs_version: 2.2.3
+  zfs_sha256: 30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3
+  zfs_sha512: e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d
 labels:
   org.opencontainers.image.source: https://github.com/siderolabs/pkgs
diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
index 1248781f..81194a96 100644
--- a/kernel/build/config-amd64
+++ b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.16 Kernel Configuration
+# Linux/x86 6.6.18 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index 88dd0ec1..d7041bf7 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.16 Kernel Configuration
+# Linux/arm64 6.6.18 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=125