From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 2C0FD1FF13C for ; Thu, 14 May 2026 17:25:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74B61379CF; Thu, 14 May 2026 17:25:23 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup-restore-image 1/5] update ZFS to 2.4.2 Date: Thu, 14 May 2026 17:25:06 +0200 Message-ID: <20260514152510.2273112-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260514152510.2273112-1-c.ebner@proxmox.com> References: <20260514152510.2273112-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778772314903 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: J3AZOMDHEGFC76AJWGFFWST3LHNEWMMY X-Message-ID-Hash: J3AZOMDHEGFC76AJWGFFWST3LHNEWMMY X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This upstream version is compatible with Linux kernels 7.0. Bump submodule commit and adapt patch to drop libudev reference so it applies again. Signed-off-by: Christian Ebner --- .../0001-remove-reference-to-libudev.patch | 20 ++++++++++++------- src/submodules/zfsonlinux | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/patches/zfs/0001-remove-reference-to-libudev.patch b/src/patches/zfs/0001-remove-reference-to-libudev.patch index 8fe9b31..bf0e3f5 100644 --- a/src/patches/zfs/0001-remove-reference-to-libudev.patch +++ b/src/patches/zfs/0001-remove-reference-to-libudev.patch @@ -8,18 +8,21 @@ since there's no command line flag I can see... Signed-off-by: Stefan Reiter [ SI adapt to aebd94cc8541e0ec3b1de57edbd57c4280213089 ] Signed-off-by: Stoiko Ivanov +[ CE adapt to 6330a45b06d20125de679aae5f63ba14082671ef ] +Signed-off-by: Christian Ebner --- - config/user-libudev.m4 | 17 ----------------- + config/user-libudev.m4 | 18 ------------------ config/user.m4 | 1 - - 2 files changed, 18 deletions(-) + 2 files changed, 19 deletions(-) delete mode 100644 config/user-libudev.m4 diff --git a/config/user-libudev.m4 b/config/user-libudev.m4 deleted file mode 100644 -index 8c3c1d7e0..000000000 +index 784cf4651..000000000 --- a/config/user-libudev.m4 +++ /dev/null -@@ -1,17 +0,0 @@ +@@ -1,18 +0,0 @@ +-dnl # SPDX-License-Identifier: CDDL-1.0 -dnl # -dnl # Check for libudev - needed for vdev auto-online and auto-replace -dnl # @@ -38,14 +41,17 @@ index 8c3c1d7e0..000000000 - ]) -]) diff --git a/config/user.m4 b/config/user.m4 -index 6ec27a5b2..46244f19b 100644 +index 1ecd4ddde..ab7f39a5a 100644 --- a/config/user.m4 +++ b/config/user.m4 -@@ -14,7 +14,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ +@@ -15,7 +15,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ AM_COND_IF([BUILD_LINUX], [ ZFS_AC_CONFIG_USER_UDEV ZFS_AC_CONFIG_USER_SYSTEMD - ZFS_AC_CONFIG_USER_LIBUDEV ZFS_AC_CONFIG_USER_LIBUUID ZFS_AC_CONFIG_USER_LIBBLKID - ]) + ZFS_AC_CONFIG_USER_STATX +-- +2.47.3 + diff --git a/src/submodules/zfsonlinux b/src/submodules/zfsonlinux index 1af41fd..6330a45 160000 --- a/src/submodules/zfsonlinux +++ b/src/submodules/zfsonlinux @@ -1 +1 @@ -Subproject commit 1af41fd203639818aa28cc624f144ef604a166d8 +Subproject commit 6330a45b06d20125de679aae5f63ba14082671ef -- 2.47.3