From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5BC7B71280 for ; Fri, 24 Jun 2022 14:56:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50E582F637 for ; Fri, 24 Jun 2022 14:56:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EF7992F613 for ; Fri, 24 Jun 2022 14:56:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A9DB843CA7 for ; Fri, 24 Jun 2022 14:55:54 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 24 Jun 2022 14:55:50 +0200 Message-Id: <20220624125552.2123628-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624125552.2123628-1-s.ivanov@proxmox.com> References: <20220624125552.2123628-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.195 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH zfsonlinux 1/3] update submodule and patches to ZFS 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: , X-List-Received-Date: Fri, 24 Jun 2022 12:56:32 -0000 Signed-off-by: Stoiko Ivanov --- debian/patches/0005-Enable-zed-emails.patch | 4 ++-- .../0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch | 4 ++-- upstream | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch index a41693a0..d87df009 100644 --- a/debian/patches/0005-Enable-zed-emails.patch +++ b/debian/patches/0005-Enable-zed-emails.patch @@ -13,10 +13,10 @@ 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 9ac77f929..672617f54 100644 +index 227b26c26..240d0dbfa 100644 --- a/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc -@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root" +@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root" ## # Minimum number of seconds between notifications for a similar event. # diff --git a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch index 6b0453b6..16ab9435 100644 --- a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +++ b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch @@ -14,7 +14,7 @@ Signed-off-by: Stoiko Ivanov rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) diff --git a/man/Makefile.am b/man/Makefile.am -index 8ab1b7572..8b3dbe633 100644 +index 64650c2b9..95a66a62f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -8,7 +8,6 @@ dist_man_MANS = \ @@ -25,7 +25,7 @@ index 8ab1b7572..8b3dbe633 100644 \ man5/vdev_id.conf.5 \ \ -@@ -21,6 +20,7 @@ dist_man_MANS = \ +@@ -22,6 +21,7 @@ dist_man_MANS = \ man7/zpoolconcepts.7 \ man7/zpoolprops.7 \ \ diff --git a/upstream b/upstream index 52bad4f2..6c3c5fcf 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 52bad4f23daaa5f827f802c8d05785a27b80275d +Subproject commit 6c3c5fcfbe27d9193cd131753cc7e47ee2784621 -- 2.30.2