From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH zfsonlinux 1/3] update submodule and patches to ZFS
Date: Fri, 24 Jun 2022 14:55:50 +0200 [thread overview]
Message-ID: <20220624125552.2123628-2-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20220624125552.2123628-1-s.ivanov@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@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@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@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
next prev parent reply other threads:[~2022-06-24 12:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 12:55 [pve-devel] [PATCH zfsonlinux 0/3] Update to ZFS 2.1.5 Stoiko Ivanov
2022-06-24 12:55 ` Stoiko Ivanov [this message]
2022-06-24 12:55 ` [pve-devel] [PATCH zfsonlinux 2/3] Build with libcurl for new keylocation=https:// Stoiko Ivanov
2022-06-24 12:55 ` [pve-devel] [PATCH zfsonlinux 3/3] d/control: add new zfs-dracut package Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220624125552.2123628-2-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.