c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: c/zfsonlinux:0ee31a51f6eaa0466b3e4d67f829a4469dc4d466
Branches Tags
c/zfsonlinux:master c/zfsonlinux:stable-7 c/zfsonlinux:stable-6 c/zfsonlinux:stable-5 c/zfsonlinux:stable-4 c/zfsonlinux:stable-3
c/zfsonlinux:zfs-2.0.6-bullseye
..
compare: c/zfsonlinux:stable-6
Branches Tags
c/zfsonlinux:master c/zfsonlinux:stable-7 c/zfsonlinux:stable-6 c/zfsonlinux:stable-5 c/zfsonlinux:stable-4 c/zfsonlinux:stable-3
c/zfsonlinux:zfs-2.0.6-bullseye

10 Commits
0ee31a51f6 .. stable-6

Author SHA1 Message Date
Thomas Lamprecht 8748101cc1 buildsys: fix DEBS variable name 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
(cherry picked from commit b577f030c4)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2022-01-12 19:39:12 +01:00
Thomas Lamprecht ff279e6b9b bump version to 2.0.7-pve1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2022-01-12 18:48:41 +01:00
Aron Xu 9b036161c8 d/rules: allow abigail to fail 
(cherry picked from debian upstream [0]
commit 5ae98b5499022c2c127d546a7b5aeb906f6f2a6b)

[0] https://salsa.debian.org/zfsonlinux-team/zfs

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 2022-01-12 18:46:00 +01:00
Stoiko Ivanov 407d5004a2 update submodule and patches to ZFS 2.0.7 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 2022-01-12 18:46:00 +01:00
Thomas Lamprecht b7ce537d24 bump version to 2.0.6-pve1~bpo10+1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:19:31 +02:00
Thomas Lamprecht 6eb925bd8a drop already applied patches 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:18:24 +02:00
Thomas Lamprecht a542d21db8 update submodule to zfs-2.0.6 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:16:51 +02:00
Thomas Lamprecht 19953df19b cherry-pick "Revert Consolidate arc_buf allocation checks" 
see https://github.com/openzfs/zfs/issues/11531

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-08 16:20:54 +02:00
Thomas Lamprecht 337bdb0b13 bump version to 2.0.5-pve1~bpo10+1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-07-21 18:12:55 +02:00
Thomas Lamprecht bc8bb69f8c buildsys: move upload target back to buster for oldstable backport 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-07-21 17:57:48 +02:00
14 changed files with 73 additions and 65 deletions
Expand all files Collapse all files
Makefile
+6 -6
View File
@@ -13,7 +13,7 @@ libpam-zfs_${ZFSPKGVER}_amd64.deb \
libuutil3linux_${ZFSPKGVER}_amd64.deb \ libuutil3linux_${ZFSPKGVER}_amd64.deb \
libzfs4linux_${ZFSPKGVER}_amd64.deb \ libzfs4linux_${ZFSPKGVER}_amd64.deb \
libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \ libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \
libzpool5linux_${ZFSPKGVER}_amd64.deb \ libzpool4linux_${ZFSPKGVER}_amd64.deb \
zfs-test_${ZFSPKGVER}_amd64.deb \ zfs-test_${ZFSPKGVER}_amd64.deb \
zfsutils-linux_${ZFSPKGVER}_amd64.deb \ zfsutils-linux_${ZFSPKGVER}_amd64.deb \
zfs-zed_${ZFSPKGVER}_amd64.deb zfs-zed_${ZFSPKGVER}_amd64.deb
@@ -26,13 +26,13 @@ python3-pyzfs_${ZFSPKGVER}_amd64.deb \
pyzfs-doc_${ZFSPKGVER}_all.deb \ pyzfs-doc_${ZFSPKGVER}_all.deb \
spl_${ZFSPKGVER}_all.deb \ spl_${ZFSPKGVER}_all.deb \
zfs-initramfs_${ZFSPKGVER}_all.deb zfs-initramfs_${ZFSPKGVER}_all.deb
ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS} DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
all: deb all: deb
.PHONY: deb .PHONY: deb
deb: ${ZFS_DEBS} deb: ${DEBS}
.PHONY: dsc .PHONY: dsc
dsc: ${ZFS_DSC} dsc: ${ZFS_DSC}
@@ -52,11 +52,11 @@ submodule:
${ZFSSRC}/README.md: submodule ${ZFSSRC}/README.md: submodule
.PHONY: zfs .PHONY: zfs
zfs: ${ZFS_DEBS} zfs: ${DEBS}
${ZFS_DEB2}: ${ZFS_DEB1} ${ZFS_DEB2}: ${ZFS_DEB1}
${ZFS_DEB1}: ${ZFSDIR} ${ZFS_DEB1}: ${ZFSDIR}
cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
lintian ${ZFS_DEBS} lintian ${DEBS}
${ZFS_DSC}: ${ZFSDIR} ${ZFS_DSC}: ${ZFSDIR}
tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR} tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
@@ -79,4 +79,4 @@ distclean: clean
.PHONY: upload .PHONY: upload
upload: ${DEBS} upload: ${DEBS}
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64 tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64
debian/changelog
Vendored
+15 -3
View File
@@ -1,8 +1,20 @@
zfs-linux (2.1.1-pve1) bullseye; urgency=medium zfs-linux (2.0.7-pve1) buster; urgency=medium
* update ZFS to 2.1.1 * update ZFS to 2.0.7
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 06:16:14 +0200 -- Proxmox Support Team <support@proxmox.com> Wed, 12 Jan 2022 18:46:26 +0100
zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
* update ZFS to 2.0.6
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 09:19:18 +0200
zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
* Rebuild for buster based releases
-- Proxmox Support Team <support@proxmox.com> Wed, 21 Jul 2021 18:01:07 +0200
zfs-linux (2.0.5-pve1) bullseye; urgency=medium zfs-linux (2.0.5-pve1) bullseye; urgency=medium
debian/control
Vendored
+4 -4
View File
@@ -70,7 +70,7 @@ Depends: libssl-dev | libssl1.0-dev,
libuutil3linux (= ${binary:Version}), libuutil3linux (= ${binary:Version}),
libzfs4linux (= ${binary:Version}), libzfs4linux (= ${binary:Version}),
libzfsbootenv1linux (= ${binary:Version}), libzfsbootenv1linux (= ${binary:Version}),
libzpool5linux (= ${binary:Version}), libzpool4linux (= ${binary:Version}),
${misc:Depends} ${misc:Depends}
Provides: libnvpair-dev, libuutil-dev Provides: libnvpair-dev, libuutil-dev
Description: OpenZFS filesystem development files for Linux Description: OpenZFS filesystem development files for Linux
@@ -78,7 +78,7 @@ Description: OpenZFS filesystem development files for Linux
libraries of OpenZFS filesystem. libraries of OpenZFS filesystem.
. .
This package includes the development files of libnvpair3, libuutil3, This package includes the development files of libnvpair3, libuutil3,
libzpool5 and libzfs4, libzfsbootenv1. libzpool4 and libzfs4.
Package: libzfs4linux Package: libzfs4linux
Section: contrib/libs Section: contrib/libs
@@ -106,7 +106,7 @@ Description: OpenZFS filesystem library for Linux
. .
The zfsbootenv library provides support for modifying ZFS label information. The zfsbootenv library provides support for modifying ZFS label information.
Package: libzpool5linux Package: libzpool4linux
Section: contrib/libs Section: contrib/libs
Architecture: linux-any Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -274,7 +274,7 @@ Suggests: libnvpair3linux-dbgsym,
libuutil3linux-dbgsym, libuutil3linux-dbgsym,
libzfs4linux-dbgsym, libzfs4linux-dbgsym,
libzfsbootenv1linux-dbgsym, libzfsbootenv1linux-dbgsym,
libzpool5linux-dbgsym, libzpool4linux-dbgsym,
zfs-test-dbgsym, zfs-test-dbgsym,
zfsutils-linux-dbgsym, zfsutils-linux-dbgsym,
zfs-zed-dbgsym, zfs-zed-dbgsym,
debian/libzpool5linux.docs → debian/libzpool4linux.docs
Vendored
View File
debian/libzpool5linux.install.in → debian/libzpool4linux.install.in
Vendored
View File
debian/libzpool5linux.lintian-overrides → debian/libzpool4linux.lintian-overrides
Vendored
View File
debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
Vendored
+3 -3
View File
@@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
index d3c083f7e..b1c8c7b9d 100644 index f0317e23e..9a5e9cb17 100644
--- a/etc/systemd/system/zfs-import-scan.service.in --- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS -ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
[Install] [Install]
WantedBy=zfs-import.target WantedBy=zfs-import.target
debian/patches/0005-Enable-zed-emails.patch
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
index df560f921..4ce7af744 100644 index 1c278b2ef..41c075c09 100644
--- a/cmd/zed/zed.d/zed.rc --- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
debian/patches/0006-dont-symlink-zed-scripts.patch
Vendored
+2 -3
View File
@@ -16,10 +16,10 @@ Forwarded: no need
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
index 2c8173b3e..ad39292e4 100644 index 8b2d0c200..118c96547 100644
--- a/cmd/zed/zed.d/Makefile.am --- a/cmd/zed/zed.d/Makefile.am
+++ b/cmd/zed/zed.d/Makefile.am +++ b/cmd/zed/zed.d/Makefile.am
@@ -49,7 +49,7 @@ install-data-hook: @@ -48,6 +48,6 @@ install-data-hook:
for f in $(zedconfdefaults); do \ for f in $(zedconfdefaults); do \
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \ -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
@@ -27,4 +27,3 @@ index 2c8173b3e..ad39292e4 100644
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \ + echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
done done
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc" chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
debian/patches/0007-Use-installed-python3.patch
Vendored
+4 -4
View File
@@ -28,11 +28,11 @@ index 3788543b0..c7ee4ae9a 100755
typeset -i cnt=0 typeset -i cnt=0
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
index 1fd21cbf7..791dd25d5 100755 index d52f0261a..18356b017 100755
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir @@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
# OpenZFS issue #7432 # ZoL issue #7432
log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2 log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
log_must touch /$TESTPOOL/$TESTFS2/attrs log_must touch /$TESTPOOL/$TESTFS2/attrs
-log_must eval "python -c 'print \"a\" * 4096' | \ -log_must eval "python -c 'print \"a\" * 4096' | \
@@ -41,10 +41,10 @@ index 1fd21cbf7..791dd25d5 100755
log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2 log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
index 394fe95bb..43560aac5 100755 index 551ed15db..bd30488ea 100755
--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c @@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
# 4. Create an empty file and add xattrs to it to exercise reclaiming a # 4. Create an empty file and add xattrs to it to exercise reclaiming a
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433) # dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
log_must zfs set compression=on xattr=sa $POOL/fs log_must zfs set compression=on xattr=sa $POOL/fs
debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
Vendored
+32 -29
View File
@@ -8,44 +8,47 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
--- ---
man/Makefile.am | 2 +- man/man1/Makefile.am | 2 +-
man/man8/Makefile.am | 1 +
man/{man1/arcstat.1 => man8/arcstat.8} | 2 +- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 3 files changed, 3 insertions(+), 2 deletions(-)
rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
diff --git a/man/Makefile.am b/man/Makefile.am diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index 8ab1b7572..8b3dbe633 100644 index 8d7457a3e..101af7b6c 100644
--- a/man/Makefile.am --- a/man/man1/Makefile.am
+++ b/man/Makefile.am +++ b/man/man1/Makefile.am
@@ -8,7 +8,6 @@ dist_man_MANS = \ @@ -1,4 +1,4 @@
man1/ztest.1 \ -dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
man1/raidz_test.1 \ +dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
man1/zvol_wait.1 \ EXTRA_DIST = cstyle.1
- man1/arcstat.1 \
\ if BUILD_LINUX
man5/vdev_id.conf.5 \ diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
\ index 07f6aefa6..a757b1c62 100644
@@ -21,6 +20,7 @@ dist_man_MANS = \ --- a/man/man8/Makefile.am
man7/zpoolconcepts.7 \ +++ b/man/man8/Makefile.am
man7/zpoolprops.7 \ @@ -1,6 +1,7 @@
\ include $(top_srcdir)/config/Substfiles.am
+ man8/arcstat.8 \
man8/fsck.zfs.8 \ dist_man_MANS = \
man8/mount.zfs.8 \ + arcstat.8 \
man8/vdev_id.8 \ fsck.zfs.8 \
mount.zfs.8 \
vdev_id.8 \
diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8 diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
similarity index 99% similarity index 99%
rename from man/man1/arcstat.1 rename from man/man1/arcstat.1
rename to man/man8/arcstat.8 rename to man/man8/arcstat.8
index a69cd8937..dfe9c971b 100644 index ca508b49c..0aa81849a 100644
--- a/man/man1/arcstat.1 --- a/man/man1/arcstat.1
+++ b/man/man8/arcstat.8 +++ b/man/man8/arcstat.8
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
.\" Copyright (c) 2015 by Delphix. All rights reserved.
.\" Copyright (c) 2020 by AJ Jordan. All rights reserved. .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
.\" .\"
.Dd May 26, 2021 -.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
-.Dt ARCSTAT 1 +.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
+.Dt ARCSTAT 8 .SH NAME
.Os arcstat \- report ZFS ARC and L2ARC statistics
. .SH SYNOPSIS
.Sh NAME
debian/rules
Vendored
+1 -1
View File
@@ -50,7 +50,7 @@ override_dh_auto_test:
override_dh_auto_test: override_dh_auto_test:
ifeq (amd64,$(DEB_HOST_ARCH)) ifeq (amd64,$(DEB_HOST_ARCH))
# Upstream provides an ABI guarantee that we validate here # Upstream provides an ABI guarantee that we validate here
$(MAKE) checkabi -$(MAKE) checkabi
endif endif
# The dh_auto_test rule is disabled because # The dh_auto_test rule is disabled because
debian/zfsutils-linux.install
Vendored
+4 -10
View File
@@ -28,7 +28,6 @@ sbin/zstreamdump
usr/bin/zvol_wait usr/bin/zvol_wait
usr/lib/modules-load.d/ lib/ usr/lib/modules-load.d/ lib/
usr/lib/zfs-linux/zpool.d/ usr/lib/zfs-linux/zpool.d/
usr/lib/zfs-linux/zpool_influxdb
usr/sbin/arc_summary usr/sbin/arc_summary
usr/sbin/arcstat usr/sbin/arcstat
usr/sbin/dbufstat usr/sbin/dbufstat
@@ -36,14 +35,7 @@ usr/share/bash-completion/completions
usr/share/man/man8/arcstat.8 usr/share/man/man8/arcstat.8
usr/share/man/man1/zhack.1 usr/share/man/man1/zhack.1
usr/share/man/man1/zvol_wait.1 usr/share/man/man1/zvol_wait.1
usr/share/man/man4/zfs.4
usr/share/man/man4/spl.4
usr/share/man/man5/ usr/share/man/man5/
usr/share/man/man7/zfsconcepts.7
usr/share/man/man7/zfsprops.7
usr/share/man/man7/zpoolconcepts.7
usr/share/man/man7/zpoolprops.7
usr/share/man/man7/zpool-features.7
usr/share/man/man8/fsck.zfs.8 usr/share/man/man8/fsck.zfs.8
usr/share/man/man8/mount.zfs.8 usr/share/man/man8/mount.zfs.8
usr/share/man/man8/vdev_id.8 usr/share/man/man8/vdev_id.8
@@ -87,6 +79,8 @@ usr/share/man/man8/zfs-userspace.8
usr/share/man/man8/zfs-wait.8 usr/share/man/man8/zfs-wait.8
usr/share/man/man8/zfs.8 usr/share/man/man8/zfs.8
usr/share/man/man8/zfs_ids_to_path.8 usr/share/man/man8/zfs_ids_to_path.8
usr/share/man/man8/zfsconcepts.8
usr/share/man/man8/zfsprops.8
usr/share/man/man8/zgenhostid.8 usr/share/man/man8/zgenhostid.8
usr/share/man/man8/zpool-add.8 usr/share/man/man8/zpool-add.8
usr/share/man/man8/zpool-attach.8 usr/share/man/man8/zpool-attach.8
@@ -100,7 +94,6 @@ usr/share/man/man8/zpool-export.8
usr/share/man/man8/zpool-get.8 usr/share/man/man8/zpool-get.8
usr/share/man/man8/zpool-history.8 usr/share/man/man8/zpool-history.8
usr/share/man/man8/zpool-import.8 usr/share/man/man8/zpool-import.8
usr/share/man/man8/zpool_influxdb.8
usr/share/man/man8/zpool-initialize.8 usr/share/man/man8/zpool-initialize.8
usr/share/man/man8/zpool-iostat.8 usr/share/man/man8/zpool-iostat.8
usr/share/man/man8/zpool-labelclear.8 usr/share/man/man8/zpool-labelclear.8
@@ -121,6 +114,7 @@ usr/share/man/man8/zpool-trim.8
usr/share/man/man8/zpool-upgrade.8 usr/share/man/man8/zpool-upgrade.8
usr/share/man/man8/zpool-wait.8 usr/share/man/man8/zpool-wait.8
usr/share/man/man8/zpool.8 usr/share/man/man8/zpool.8
usr/share/man/man8/zpoolconcepts.8
usr/share/man/man8/zpoolprops.8
usr/share/man/man8/zstream.8 usr/share/man/man8/zstream.8
usr/share/man/man8/zstreamdump.8 usr/share/man/man8/zstreamdump.8
usr/share/zfs/compatibility.d/
upstream
+1 -1
Submodule upstream updated: 71c6098526...ad81baab77