[pve-devel] [PATCH zfsonlinux 1/3] update submodule and patches to ZFS

Stoiko Ivanov s.ivanov at proxmox.com
Fri Jun 24 14:55:50 CEST 2022


Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 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 <t.lamprecht at proxmox.com>
  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 <s.ivanov at proxmox.com>
  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





More information about the pve-devel mailing list