From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BCDCD1FF13B for ; Tue, 13 Jan 2026 15:11:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D615319581; Tue, 13 Jan 2026 15:10:56 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 13 Jan 2026 15:07:09 +0100 Message-ID: <20260113141037.3159275-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260113141037.3159275-1-s.ivanov@proxmox.com> References: <20260113141037.3159275-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768313399758 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.055 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 KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish KAM_SHORT 0.001 Use of a URL Shortener for very short URL SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" the patches for 6.17 compat are already in 2.4.0, and the remaining patch which renamed arcstat(1) to arcstat(8) was dropped by debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs in: 68ed35d6d ("d/patches: remove applied patches in upstream") Signed-off-by: Stoiko Ivanov --- ...META-and-DCH-consistency-in-autoconf.patch | 2 +- .../0002-always-load-ZFS-module-on-boot.patch | 2 +- ...o-the-zed-binary-on-the-systemd-unit.patch | 2 +- ...ith-d-dev-disk-by-id-in-scan-service.patch | 2 +- debian/patches/0005-Enable-zed-emails.patch | 2 +- .../0006-dont-symlink-zed-scripts.patch | 2 +- ...md-unit-for-importing-specific-pools.patch | 6 +- ...-move-manpage-arcstat-1-to-arcstat-8.patch | 52 ------ ...ten-bounds-for-noalloc-stat-availab.patch} | 4 +- ...17-d_set_d_op-is-no-longer-available.patch | 175 ------------------ .../patches/0011-Linux-6.17-compat-META.patch | 29 --- debian/patches/series | 5 +- upstream | 2 +- 13 files changed, 13 insertions(+), 272 deletions(-) delete mode 100644 debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch rename debian/patches/{0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch => 0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch} (94%) delete mode 100644 debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch delete mode 100644 debian/patches/0011-Linux-6.17-compat-META.patch diff --git a/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch b/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch index 504bb9987..41fa5b583 100644 --- a/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch +++ b/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch @@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 -index 20064a0fb..4d5f545ad 100644 +index 20064a0fb5957288640494bd6a640942796050b4..4d5f545adc23c3c97604b7a1ac47e9711c81e9fd 100644 --- a/config/zfs-meta.m4 +++ b/config/zfs-meta.m4 @@ -1,9 +1,10 @@ diff --git a/debian/patches/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/0002-always-load-ZFS-module-on-boot.patch index 6b1e068b1..87133b7f5 100644 --- a/debian/patches/0002-always-load-ZFS-module-on-boot.patch +++ b/debian/patches/0002-always-load-ZFS-module-on-boot.patch @@ -19,7 +19,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf -index 44e1bb3ed..7509b03cb 100644 +index 44e1bb3ed906b18eaafb6376471380b669590357..7509b03cb7dd8f326db514841f3f90d47021caa7 100644 --- a/etc/modules-load.d/zfs.conf +++ b/etc/modules-load.d/zfs.conf @@ -1,3 +1,3 @@ diff --git a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch index fa365df58..51f3e4e24 100644 --- a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch +++ b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in -index be2fc6734..7606604ec 100644 +index be2fc67348f937b074554377f46d51ef81ef5105..7606604ec0251a1239e078dc15fd969a584bb843 100644 --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in @@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch index 7ea61c811..d551dc595 100644 --- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch +++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch @@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in -index c5dd45d87..1c792edf0 100644 +index c5dd45d87e683bd78d0d09c506f5b3db179edf2e..1c792edf054271560ec482b0ed8eab8e7b900253 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch index 44b30d83f..87769ce10 100644 --- a/debian/patches/0005-Enable-zed-emails.patch +++ b/debian/patches/0005-Enable-zed-emails.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc -index af56147a9..47fb01631 100644 +index af56147a969b0bef63a9cd6b16b1b59c186298b0..47fb01631ec46980ba1ffbce5d2bb69a3e7150fc 100644 --- a/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc @@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root" diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch index 2591e8604..d017f18fc 100644 --- a/debian/patches/0006-dont-symlink-zed-scripts.patch +++ b/debian/patches/0006-dont-symlink-zed-scripts.patch @@ -32,7 +32,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am -index 093a04c46..e5e735d00 100644 +index c0b161ecf2489ee2ba5988f51bda99ac0dd2f639..141116709dfbfb32f6b3da81b25d69499dc6e72c 100644 --- a/cmd/zed/zed.d/Makefile.am +++ b/cmd/zed/zed.d/Makefile.am @@ -50,7 +50,7 @@ zed-install-data-hook: diff --git a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch index 0c18fe8e4..28477cbcd 100644 --- a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch +++ b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch @@ -23,7 +23,7 @@ Signed-off-by: Thomas Lamprecht create mode 100644 etc/systemd/system/zfs-import@.service.in diff --git a/etc/Makefile.am b/etc/Makefile.am -index 808c729cd..88f85ca9b 100644 +index 808c729cd96838f4039a1e4476826a958414ce4f..88f85ca9bbebcc76e81adcad6d56c07b8661b09e 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \ @@ -35,7 +35,7 @@ index 808c729cd..88f85ca9b 100644 %D%/systemd/system/zfs-mount.service \ %D%/systemd/system/zfs-mount@.service \ diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset -index e4056a92c..030611419 100644 +index e4056a92cd985380aa7346f4b291e4c3f1446fee..030611419816c83bcb86fc9c23d31855014eb914 100644 --- a/etc/systemd/system/50-zfs.preset +++ b/etc/systemd/system/50-zfs.preset @@ -1,6 +1,7 @@ @@ -48,7 +48,7 @@ index e4056a92c..030611419 100644 enable zfs-share.service diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in new file mode 100644 -index 000000000..5bd19fb79 +index 0000000000000000000000000000000000000000..5bd19fb795e2b5554b3932e0b84b2668c2dcac51 --- /dev/null +++ b/etc/systemd/system/zfs-import@.service.in @@ -0,0 +1,18 @@ diff --git a/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch deleted file mode 100644 index aa9d05667..000000000 --- a/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stoiko Ivanov -Date: Thu, 4 Feb 2021 19:01:12 +0100 -Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8). - -Originally-By: Mo Zhou -Originally-By: Antonio Russo - -Signed-off-by: Stoiko Ivanov -Signed-off-by: Thomas Lamprecht ---- - man/Makefile.am | 2 +- - man/{man1/arcstat.1 => man8/arcstat.8} | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 6a7b2d3e4..11df2ebf5 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -2,7 +2,6 @@ dist_noinst_man_MANS = \ - %D%/man1/cstyle.1 - - dist_man_MANS = \ -- %D%/man1/arcstat.1 \ - %D%/man1/raidz_test.1 \ - %D%/man1/test-runner.1 \ - %D%/man1/zhack.1 \ -@@ -22,6 +21,7 @@ dist_man_MANS = \ - %D%/man7/zpoolconcepts.7 \ - %D%/man7/zpoolprops.7 \ - \ -+ %D%/man8/arcstat.8 \ - %D%/man8/fsck.zfs.8 \ - %D%/man8/mount.zfs.8 \ - %D%/man8/vdev_id.8 \ -diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8 -similarity index 99% -rename from man/man1/arcstat.1 -rename to man/man8/arcstat.8 -index f2474fbb7..5ab0018ec 100644 ---- a/man/man1/arcstat.1 -+++ b/man/man8/arcstat.8 -@@ -14,7 +14,7 @@ - .\" Copyright (c) 2020 by AJ Jordan. All rights reserved. - .\" - .Dd December 23, 2022 --.Dt ARCSTAT 1 -+.Dt ARCSTAT 8 - .Os - . - .Sh NAME diff --git a/debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch b/debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch similarity index 94% rename from debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch rename to debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch index 8ecc9a232..8c1cecaee 100644 --- a/debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch +++ b/debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch @@ -51,10 +51,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c -index 51c3963dd..75ea14bae 100644 +index a4a372834718ed48255e9b7a2dd375be0b45bc64..c059dd75283dbf89dcd3959c44b2341f13aac820 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c -@@ -3117,7 +3117,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name, +@@ -3112,7 +3112,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name, if (vs->vs_scan_removing != 0) { (void) printf(gettext(" (removing)")); diff --git a/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch b/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch deleted file mode 100644 index 1084fefca..000000000 --- a/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rob Norris -Date: Thu, 31 Jul 2025 13:12:43 +1000 -Subject: [PATCH] Linux 6.17: d_set_d_op() is no longer available - -We only have extremely narrow uses, so move it all into a single -function that does only what we need, with and without d_set_d_op(). - -Sponsored-by: https://despairlabs.com/sponsor/ -Reviewed-by: Brian Behlendorf -Reviewed-by: Tony Hutter -Signed-off-by: Rob Norris -Closes #17621 -(cherry picked from commit 0df91abe821e52bc63c59f4fd0548835081dc3ad) -Signed-off-by: Thomas Lamprecht ---- - config/kernel-dentry-operations.m4 | 10 +++- - include/os/linux/kernel/linux/dcache_compat.h | 26 --------- - module/os/linux/zfs/zpl_ctldir.c | 55 ++++++++++++++++--- - 3 files changed, 55 insertions(+), 36 deletions(-) - -diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4 -index aa5a9f2aff3927626bef3a8121716e6251dcc1ad..9d1bb3a74b1db03013eb951bea43d069707fe6ee 100644 ---- a/config/kernel-dentry-operations.m4 -+++ b/config/kernel-dentry-operations.m4 -@@ -24,6 +24,9 @@ dnl # - dnl # 2.6.38 API change - dnl # Added d_set_d_op() helper function. - dnl # -+dnl # 6.17 API change -+dnl # d_set_d_op() removed. No direct replacement. -+dnl # - AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [ - ZFS_LINUX_TEST_SRC([d_set_d_op], [ - #include -@@ -34,11 +37,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [ - - AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP], [ - AC_MSG_CHECKING([whether d_set_d_op() is available]) -- ZFS_LINUX_TEST_RESULT_SYMBOL([d_set_d_op], -- [d_set_d_op], [fs/dcache.c], [ -+ ZFS_LINUX_TEST_RESULT([d_set_d_op], [ - AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_D_SET_D_OP, 1, -+ [Define if d_set_d_op() is available]) - ], [ -- ZFS_LINUX_TEST_ERROR([d_set_d_op]) -+ AC_MSG_RESULT(no) - ]) - ]) - -diff --git a/include/os/linux/kernel/linux/dcache_compat.h b/include/os/linux/kernel/linux/dcache_compat.h -index 16e8a319a5f83f41588ec62477a0e4729ec030d7..152e5a606f0e273e364c855391c9d42aec738c20 100644 ---- a/include/os/linux/kernel/linux/dcache_compat.h -+++ b/include/os/linux/kernel/linux/dcache_compat.h -@@ -60,32 +60,6 @@ - } while (0) - #endif - --/* -- * 2.6.30 API change, -- * The const keyword was added to the 'struct dentry_operations' in -- * the dentry structure. To handle this we define an appropriate -- * dentry_operations_t typedef which can be used. -- */ --typedef const struct dentry_operations dentry_operations_t; -- --/* -- * 2.6.38 API addition, -- * Added d_clear_d_op() helper function which clears some flags and the -- * registered dentry->d_op table. This is required because d_set_d_op() -- * issues a warning when the dentry operations table is already set. -- * For the .zfs control directory to work properly we must be able to -- * override the default operations table and register custom .d_automount -- * and .d_revalidate callbacks. -- */ --static inline void --d_clear_d_op(struct dentry *dentry) --{ -- dentry->d_op = NULL; -- dentry->d_flags &= ~( -- DCACHE_OP_HASH | DCACHE_OP_COMPARE | -- DCACHE_OP_REVALIDATE | DCACHE_OP_DELETE); --} -- - /* - * Walk and invalidate all dentry aliases of an inode - * unless it's a mountpoint -diff --git a/module/os/linux/zfs/zpl_ctldir.c b/module/os/linux/zfs/zpl_ctldir.c -index 48dae79a237393a278fee972a90f2242cac48ea7..81ac26cb0c93a8faf7e6ba1bfe53982ef06191de 100644 ---- a/module/os/linux/zfs/zpl_ctldir.c -+++ b/module/os/linux/zfs/zpl_ctldir.c -@@ -202,7 +202,7 @@ zpl_snapdir_revalidate(struct dentry *dentry, unsigned int flags) - return (!!dentry->d_inode); - } - --static dentry_operations_t zpl_dops_snapdirs = { -+static const struct dentry_operations zpl_dops_snapdirs = { - /* - * Auto mounting of snapshots is only supported for 2.6.37 and - * newer kernels. Prior to this kernel the ops->follow_link() -@@ -215,6 +215,51 @@ static dentry_operations_t zpl_dops_snapdirs = { - .d_revalidate = zpl_snapdir_revalidate, - }; - -+/* -+ * For the .zfs control directory to work properly we must be able to override -+ * the default operations table and register custom .d_automount and -+ * .d_revalidate callbacks. -+ */ -+static void -+set_snapdir_dentry_ops(struct dentry *dentry, unsigned int extraflags) { -+ static const unsigned int op_flags = -+ DCACHE_OP_HASH | DCACHE_OP_COMPARE | -+ DCACHE_OP_REVALIDATE | DCACHE_OP_DELETE | -+ DCACHE_OP_PRUNE | DCACHE_OP_WEAK_REVALIDATE | DCACHE_OP_REAL; -+ -+#ifdef HAVE_D_SET_D_OP -+ /* -+ * d_set_d_op() will set the DCACHE_OP_ flags according to what it -+ * finds in the passed dentry_operations, so we don't have to. -+ * -+ * We clear the flags and the old op table before calling d_set_d_op() -+ * because issues a warning when the dentry operations table is already -+ * set. -+ */ -+ dentry->d_op = NULL; -+ dentry->d_flags &= ~op_flags; -+ d_set_d_op(dentry, &zpl_dops_snapdirs); -+ dentry->d_flags |= extraflags; -+#else -+ /* -+ * Since 6.17 there's no exported way to modify dentry ops, so we have -+ * to reach in and do it ourselves. This should be safe for our very -+ * narrow use case, which is to create or splice in an entry to give -+ * access to a snapshot. -+ * -+ * We need to set the op flags directly. We hardcode -+ * DCACHE_OP_REVALIDATE because that's the only operation we have; if -+ * we ever extend zpl_dops_snapdirs we will need to update the op flags -+ * to match. -+ */ -+ spin_lock(&dentry->d_lock); -+ dentry->d_op = &zpl_dops_snapdirs; -+ dentry->d_flags &= ~op_flags; -+ dentry->d_flags |= DCACHE_OP_REVALIDATE | extraflags; -+ spin_unlock(&dentry->d_lock); -+#endif -+} -+ - static struct dentry * - zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry, - unsigned int flags) -@@ -236,10 +281,7 @@ zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry, - return (ERR_PTR(error)); - - ASSERT(error == 0 || ip == NULL); -- d_clear_d_op(dentry); -- d_set_d_op(dentry, &zpl_dops_snapdirs); -- dentry->d_flags |= DCACHE_NEED_AUTOMOUNT; -- -+ set_snapdir_dentry_ops(dentry, DCACHE_NEED_AUTOMOUNT); - return (d_splice_alias(ip, dentry)); - } - -@@ -373,8 +415,7 @@ zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode) - - error = -zfsctl_snapdir_mkdir(dip, dname(dentry), vap, &ip, cr, 0); - if (error == 0) { -- d_clear_d_op(dentry); -- d_set_d_op(dentry, &zpl_dops_snapdirs); -+ set_snapdir_dentry_ops(dentry, 0); - d_instantiate(dentry, ip); - } - diff --git a/debian/patches/0011-Linux-6.17-compat-META.patch b/debian/patches/0011-Linux-6.17-compat-META.patch deleted file mode 100644 index d759e2a53..000000000 --- a/debian/patches/0011-Linux-6.17-compat-META.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf -Date: Fri, 26 Sep 2025 10:00:18 -0700 -Subject: [PATCH] Linux 6.17 compat: META - -Update the META file to reflect compatibility with the 6.17 -kernel. - -Reviewed-by: Alexander Motin -Reviewed-by: Rob Norris -Signed-off-by: Brian Behlendorf -Closes #17789 -(cherry picked from commit 654a2ccc74fcc8fc97aae54e2ce1de647d587ae2) -Signed-off-by: Thomas Lamprecht ---- - META | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/META b/META -index f2c90626528b48f00c122a7ca7f208d7691eeac0..c96da9b726b1467111cd726f57914e4c635564af 100644 ---- a/META -+++ b/META -@@ -6,5 +6,5 @@ Release: 1 - Release-Tags: relext - License: CDDL - Author: OpenZFS --Linux-Maximum: 6.16 -+Linux-Maximum: 6.17 - Linux-Minimum: 4.18 diff --git a/debian/patches/series b/debian/patches/series index 456eb94ee..e6637ed22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,4 @@ 0005-Enable-zed-emails.patch 0006-dont-symlink-zed-scripts.patch 0007-Add-systemd-unit-for-importing-specific-pools.patch -0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch -0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch -0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch -0011-Linux-6.17-compat-META.patch +0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch diff --git a/upstream b/upstream index 34f96a15c..743334913 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 34f96a15c73eab27dd6ad17bb5f1263bf26e37d7 +Subproject commit 743334913e5a5f60baf287bcc6d8a23515b02ac5 -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel