bump version to 2.2.4-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

.gitignore

@@ -0,0 +1,7 @@
+/*.build
+/*.buildinfo
+/*.changes
+/*.deb
+/*.dsc
+/*.tar*
+/zfs-utils-*.*/

Makefile

@@ -1,72 +1,93 @@
+include /usr/share/dpkg/default.mk
 # source form https://github.com/zfsonlinux/
 
-ZFSPKG=debian
+PACKAGE = zfs-linux
-ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=upstream
 
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+SRCDIR = upstream
-ZFS_DEB2= 					\
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+ZFS_DEB_BINARY =				\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+libpam-zfs_$(DEB_VERSION)_amd64.deb		\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
+libuutil3linux_$(DEB_VERSION)_amd64.deb		\
-zfs-test_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_$(DEB_VERSION)_amd64.deb		\
-zfsutils-linux_${ZFSPKGVER}_amd64.deb
+libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
-ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+libzpool5linux_$(DEB_VERSION)_amd64.deb		\
-ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
+zfs-test_$(DEB_VERSION)_amd64.deb			\
+zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
+zfs-zed_$(DEB_VERSION)_amd64.deb
+
+ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
+
+ZFS_DEB2= $(ZFS_DEB_BINARY)			\
+libzfslinux-dev_$(DEB_VERSION)_amd64.deb		\
+python3-pyzfs_$(DEB_VERSION)_amd64.deb		\
+pyzfs-doc_$(DEB_VERSION)_all.deb			\
+spl_$(DEB_VERSION)_all.deb			\
+zfs-initramfs_$(DEB_VERSION)_all.deb
+DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
+
+ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc
 
 all: deb
-.PHONY: deb
+
-deb: ${ZFS_DEBS}
+.PHONY: deb dsc
-.PHONY: dsc
+deb: $(DEBS)
-dsc: ${ZFS_DSC}
+
+dsc:
+	rm -rf *.dsc $(BUILDDIR)
+	$(MAKE) $(ZFS_DSC)
+	lintian $(ZFS_DSC)
 
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
-kernel: dsc
+kernel: $(ZFS_DSC)
-	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
+	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
 	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
-dinstall: ${DEBS}
+dinstall: $(DEBS)
-	dpkg -i ${DEBS}
+	dpkg -i $(DEBS)
 
 .PHONY: submodule
 submodule:
-	test -f "$(ZFSSRC)/README.md" || git submodule update --init
+	test -f "$(SRCDIR)/README.md" || git submodule update --init
-$(ZFSSRC)/README.md: submodule
+
+$(SRCDIR)/README.md: submodule
 
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs: $(DEBS)
-$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
-$(ZFS_DEB1): ${ZFSDIR}
+$(ZFS_DEB1): $(BUILDDIR)
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+	lintian $(DEBS)
 
-${ZFS_DSC}: ${ZFSDIR}
+$(ORIG_SRC_TAR): $(BUILDDIR)
-	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
+	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
-	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
-	lintian $@
 
-${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
+$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
-	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
+	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
-	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
-	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
-	mv ${ZFSDIR}.tmp ${ZFSDIR}
 
+sbuild: $(ZFS_DSC)
+	sbuild $(ZFS_DSC)
+
+$(BUILDDIR): $(SRCDIR)/README.md $(SRCDIR) debian
+	rm -rf $@ $@.tmp
+	cp -a $(SRCDIR) $@.tmp
+	cp -a debian $@.tmp/debian
+	mv $@.tmp $@
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
+	rm -rf $(PACKAGE)-[0-9]*/
+	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: upload
-upload: ${DEBS}
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+upload: $(DEBS)
+	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)

debian/changelog

@@ -1,3 +1,254 @@
+zfs-linux (2.2.4-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.4 release
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Jun 2024 11:11:48 +0200
+
+zfs-linux (2.2.3-pve2) bookworm; urgency=medium
+
+  * fix #4835: order zfs-import@ before -cache/-scan
+
+  * backport (module) patches from the 2.2.4 staging tree for better Linux 6.8
+    support
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 08 Apr 2024 17:43:35 +0200
+
+zfs-linux (2.2.3-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.3 release
+
+  * fix #5288: correctly handle zvols with more than 15 partitions in udev
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Mar 2024 13:42:50 +0100
+
+zfs-linux (2.2.2-pve2) bookworm; urgency=medium
+
+  * fix #5101: ensure datasets that have sharenfs enabled are not unexported
+    after a `zfs mount -a` call.
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 19 Feb 2024 16:56:37 +0100
+
+zfs-linux (2.2.2-pve1) bookworm; urgency=medium
+
+  * update to new ZFS upstream 2.2.2 release, as we have all important fixes
+    for recent discovered data integrity issues backported to previous
+    versions, there should be no visible change in that regard.
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 04 Dec 2023 16:50:25 +0100
+
+zfs-linux (2.2.0-pve4) bookworm; urgency=medium
+
+  * pick bug-fix staged for 2.2.2:
+    - fix (rare) corruption caused by dirty dnode being treated as clean
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 29 Nov 2023 09:21:26 +0100
+
+zfs-linux (2.2.0-pve3) bookworm; urgency=medium
+
+  * pick bug-fixes staged for 2.2.1:
+    - add a tunable to disable BRT support and disable it by default
+    - fix block cloning between unencrypted and encrypted datasets
+    - disable block cloning by default
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 17:32:58 +0100
+
+zfs-linux (2.2.0-pve2) bookworm; urgency=medium
+
+  * avoid error from zfs-mount when /etc/exports.d does not exist (yet)
+
+  * ensure vdev_stat struct layout compat between 2.1 and 2.2, avoiding
+    false-positive detection of the non-allocating feature from 2.2 when the
+    kernel still used the 2.1 module.
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Nov 2023 16:02:02 +0100
+
+zfs-linux (2.2.0-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.2.0
+
+  * zfsutils-linux:
+    - install new systemd units to trim a pool periodically
+    - ship new `zilstat` binary
+    - and new man pages for zfs lock, zfs unlock and vdev properties
+    - remove man pages for zfs jail and zfs unjail, those are for FreeBSD only
+      and the respective commands where never exposed for Linux
+
+  * fix #5014: re-enable blk-mq optimization
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Oct 2023 12:09:24 +0200
+
+zfs-linux (2.1.13-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.13
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Sep 2023 12:22:28 +0200
+
+zfs-linux (2.1.12-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.12
+
+  * zfs trim: avoid exit-failure if last pool isn't nvme-only
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Jun 2023 15:25:16 +0200
+
+zfs-linux (2.1.11-pve2) bookworm; urgency=medium
+
+  * re-build for Debian 12 Bookworm based releases
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 20 May 2023 19:32:04 +0200
+
+zfs-linux (2.1.11-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Apr 2023 09:30:53 +0200
+
+zfs-linux (2.1.9-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:03:22 +0100
+
+zfs-linux (2.1.7-pve3) bullseye; urgency=medium
+
+  * backport a fix for as potentially hanging pipe when resizing it on recv
+
+  * backport a fix for setting extended attributes (xattr)
+
+  * adapt to 6.1 changes for open syscall with TMPFILE option
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 13:21:57 +0100
+
+zfs-linux (2.1.7-pve2) bullseye; urgency=medium
+
+  * backport fix for initramfs script when detecting rootfs legacy mountpoints
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Jan 2023 17:07:18 +0100
+
+zfs-linux (2.1.7-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Dec 2022 16:41:31 +0100
+
+zfs-linux (2.1.6-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.6
+
+  * symlink zpool_influxdb to /bin
+
+  * symlink zfs, zpool to /bin/ for non-root usage
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Oct 2022 16:09:17 +0200
+
+zfs-linux (2.1.5-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.5
+
+  * Build with libcurl for new keylocation=https://
+
+  * d/control: add new zfs-dracut package
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2022 16:13:24 +0200
+
+zfs-linux (2.1.4-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Mar 2022 09:28:50 +0100
+
+zfs-linux (2.1.3-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 11 Mar 2022 16:36:22 +0100
+
+zfs-linux (2.1.2-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Jan 2022 11:31:34 +0100
+
+zfs-linux (2.1.1-pve3) bullseye; urgency=medium
+
+  * zfs-utils: arc stat/summary: guard access to l2arc MFU/MRU stats to avoid
+    bogus exception when checking the ARC stats/summary on a older, 2.0 based
+    ZFS kernel module with the newer, 2.1 based, user space tools.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 10 Nov 2021 09:58:31 +0100
+
+zfs-linux (2.1.1-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:14 +0200
+
+zfs-linux (2.0.5-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.0.5
+
+  * do not restart most services upon upgrade
+
+  * add a script and cronjob for regular trimming of pools
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jul 2021 18:23:58 +0200
+
+zfs-linux (2.0.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 13:31:18 +0100
+
+zfs-linux (2.0.3-pve2) pve pmg; urgency=medium
+
+  * match package names to the ones used by Debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Feb 2021 13:06:07 +0100
+
+zfs-linux (2.0.3-pve1) pve pmg; urgency=medium
+
+  * buildsys: make libpam-zfs a separate package
+
+  * update ZFS to 2.0.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 15:46:03 +0100
+
+zfs-linux (2.0.2-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Feb 2021 10:23:03 +0100
+
+zfs-linux (2.0.1-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jan 2021 14:16:02 +0100
+
+zfs-linux (0.8.5-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.5
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Oct 2020 10:45:28 +0200
+
+zfs-linux (0.8.4-pve2) pve pmg; urgency=medium
+
+  * add systemd-unit for importing specific pools
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 29 Sep 2020 05:31:35 +0200
+
+zfs-linux (0.8.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 May 2020 10:39:11 +0200
+
+zfs-linux (0.8.3-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2020 09:10:41 +0100
+
 zfs-linux (0.8.2-pve2) pve pmg; urgency=medium
 
   * save and restore the FPU state using ZFS dedicated per-cpu FPU state

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -2,11 +2,17 @@ Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: abigail-tools,
+               debhelper-compat (= 12),
                dh-python,
+               libaio-dev,
                libblkid-dev,
+               libcurl4-openssl-dev | libcurl4-gnutls-dev,
+               libelf-dev,
+               libpam0g-dev,
                libssl-dev | libssl1.0-dev,
                libtool,
+               libudev-dev,
                lsb-release,
                python3-cffi,
                python3-setuptools,
@@ -14,28 +20,40 @@ Build-Depends: debhelper (>= 10~),
                python3-all-dev,
                uuid-dev,
                zlib1g-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.5.1
 Homepage: https://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
 
-Package: libnvpair1linux
+Package: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
+Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
-Replaces: libnvpair1
+Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 Description: Solaris name-value library for Linux
  This library provides routines for packing and unpacking nv pairs for
  transporting data across process boundaries, transporting between
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1linux
+Package: libpam-zfs
+Section: contrib/admin
+Architecture: linux-any
+Depends: libpam-runtime, ${misc:Depends}, ${shlibs:Depends}
+Description: PAM module for managing encryption keys for ZFS
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ This provides a Pluggable Authentication Module (PAM) that automatically
+ unlocks encrypted ZFS datasets upon login.
+
+Package: libuutil3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
+Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
-Replaces: libuutil1
+Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 Description: Solaris userland utility library for Linux
  This library provides a variety of glue functions for ZFS on Linux:
   * libspl: The Solaris Porting Layer userland library, which provides APIs
@@ -50,42 +68,60 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
+Depends: libssl-dev | libssl1.0-dev,
-         libuutil1linux (= ${binary:Version}),
+         libnvpair3linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
+         libzfsbootenv1linux (= ${binary:Version}),
+         libzpool5linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
  libraries of OpenZFS filesystem.
  .
- This package includes the development files of libnvpair1, libuutil1,
+ This package includes the development files of libnvpair3, libuutil3,
- libzpool2 and libzfs2.
+ libzpool5 and libzfs4, libzfsbootenv1.
 
-Package: libzfs2linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
+# The libcurl4 is loaded through dlopen("libcurl.so.4").
-Replaces: libzfs2
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
-Description: OpenZFS filesystem library for Linux
+Recommends: libcurl4
- The Z file system is a pooled filesystem designed for maximum data
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
- integrity, supporting data snapshots, multiple copies, and data
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
- checksums.
+Description: OpenZFS filesystem library for Linux - general support
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
-Package: libzpool2linux
+Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
+Breaks: libzfs2, libzfs4
-Replaces: libzpool2
+Replaces: libzfs2, libzfs4
+Description: OpenZFS filesystem library for Linux
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ The zfsbootenv library provides support for modifying ZFS label information.
+
+Package: libzpool5linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
+Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 Description: OpenZFS pool library for Linux
- The Z file system is a pooled filesystem designed for maximum data
+ OpenZFS is a storage platform that encompasses the functionality of
- integrity, supporting data snapshots, multiple copies, and data
+ traditional filesystems and volume managers. It supports data checksums,
- checksums.
+ compression, encryption, snapshots, and more.
  .
  This zpool library provides support for managing zpools.
 
@@ -115,6 +151,7 @@ Section: contrib/doc
 Architecture: all
 Depends:
  ${sphinxdoc:Depends},
+ ${sphinxdoc:Built-Using},
  ${misc:Depends}
 Recommends:
  python3-pyzfs
@@ -143,27 +180,40 @@ Depends: busybox-initramfs | busybox-static | busybox,
 Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
- The Z file system is a pooled filesystem designed for maximum data
+ OpenZFS is a storage platform that encompasses the functionality of
- integrity, supporting data snapshots, multiple copies, and data
+ traditional filesystems and volume managers. It supports data checksums,
- checksums.
+ compression, encryption, snapshots, and more.
  .
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
+Package: zfs-dracut
+Architecture: all
+Depends: dracut,
+         zfsutils-linux (>= ${source:Version}),
+         ${misc:Depends}
+Description: OpenZFS root filesystem capabilities for Linux - dracut
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ This package adds OpenZFS to the system initramfs with a hook
+ for the dracut infrastructure.
+
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
-Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Depends: python3, ${misc:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-zed
+Recommends: zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
- The Z file system is a pooled filesystem designed for maximum data
+ OpenZFS is a storage platform that encompasses the functionality of
- integrity, supporting data snapshots, multiple copies, and data
+ traditional filesystems and volume managers. It supports data checksums,
- checksums.
+ compression, encryption, snapshots, and more.
  .
  This package provides the zfs and zpool commands to create and administer
  OpenZFS filesystems.
@@ -174,10 +224,16 @@ Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: bsd-mailx | mailutils
 Description: OpenZFS Event Daemon
- The Z file system is a pooled filesystem designed for maximum data
+ OpenZFS is a storage platform that encompasses the functionality of
- integrity, supporting data snapshots, multiple copies, and data
+ traditional filesystems and volume managers. It supports data checksums,
- checksums.
+ compression, encryption, snapshots, and more.
+ .
+ ZED (ZFS Event Daemon) monitors events generated by the ZFS kernel
+ module. When a zevent (ZFS Event) is posted, ZED will run any ZEDLETs
+ (ZFS Event Daemon Linkage for Executable Tasks) that have been enabled
+ for the corresponding zevent class.
  .
  This package provides the OpenZFS Event Daemon (zed).
 
@@ -185,6 +241,7 @@ Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
+         attr,
          bc,
          fio,
          ksh,
@@ -198,37 +255,19 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: nfs-kernel-server
 Breaks: zfsutils-linux (<= 0.7.9-2)
 Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
-Description: OpenZFS test infrastructure an support scripts
+Description: OpenZFS test infrastructure and support scripts
- The Z file system is a pooled filesystem designed for maximum data
+ OpenZFS is a storage platform that encompasses the functionality of
- integrity, supporting data snapshots, multiple copies, and data
+ traditional filesystems and volume managers. It supports data checksums,
- checksums.
+ compression, encryption, snapshots, and more.
  .
  This package provides the OpenZFS test infrastructure for destructively
  testing and validating a system using OpenZFS. It is entirely optional
  and should only be installed and used in test environments.
 
-Package: zfs-dbg
-Section: contrib/debug
-Priority: optional
-Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
-         zfs-zed (= ${binary:Version}),
-         zfsutils-linux (= ${binary:Version}),
-         ${misc:Depends}
-Description: Debugging symbols for OpenZFS userland libraries and tools
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package contains the debugging symbols for libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
-
 Package: spl
 Section: contrib/metapackages
 Architecture: all

debian/libnvpair1linux.install

@@ -1 +0,0 @@
-lib/libnvpair.so.*

debian/libnvpair1linux.lintian-overrides

@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames

debian/libnvpair3linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*

debian/libnvpair3linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libpam-zfs.install

@@ -0,0 +1,2 @@
+lib/*/security/pam_zfs_key.so
+usr/share/pam-configs/zfs_key

debian/libpam-zfs.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#

debian/libpam-zfs.prerm

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] ; then
+    pam-auth-update --package --remove zfs_key
+fi
+
+#DEBHELPER#

debian/libuutil1linux.install

@@ -1 +0,0 @@
-lib/libuutil.so.*

debian/libuutil1linux.lintian-overrides

@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames

debian/libuutil3linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libuutil.so.*

debian/libuutil3linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libzfs2linux.install

@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*

debian/libzfs2linux.lintian-overrides

@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames

debian/libzfs4linux.install.in

@@ -0,0 +1,2 @@
+lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*

debian/libzfs4linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libzfsbootenv1linux.install

@@ -0,0 +1 @@
+lib/libzfsbootenv.so.*

debian/libzfsbootenv1linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*

debian/libzfsbootenv1linux.lintian-overrides

@@ -0,0 +1,2 @@
+package-name-doesnt-match-sonames
+extra-license-file *usr/share/doc/libzfsbootenv1linux/LICENSE.gz*

debian/libzfslinux-dev.install

@@ -1,4 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so
-usr/share/pkgconfig/*.pc

debian/libzfslinux-dev.install.in

@@ -0,0 +1,4 @@
+lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include
+usr/lib/@DEB_HOST_MULTIARCH@/*.so
+/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc

debian/libzpool2linux.install

@@ -1 +0,0 @@
-lib/libzpool.so.*

debian/libzpool2linux.lintian-overrides

@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames

debian/libzpool5linux.docs

@@ -0,0 +1,2 @@
+COPYRIGHT
+LICENSE

debian/libzpool5linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzpool.so.*

debian/libzpool5linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/not-installed

@@ -1,5 +1,6 @@
 usr/share/zfs/enum-extract.pl
 usr/share/zfs/zfs-helpers.sh
+etc/default/zfs
 etc/init.d
 etc/sudoers.d
 etc/zfs/vdev_id.conf.alias.example
@@ -9,3 +10,4 @@ etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
 usr/lib/dracut
 usr/share/zfs/enum-extract.pl
+etc/zfs/zfs-functions

debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch

@@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index aa0fc1420..f525e2010 100644
+index 20064a0fb..4d5f545ad 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
 @@ -1,9 +1,10 @@
@@ -67,4 +67,4 @@ index aa0fc1420..f525e2010 100644
 +		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
  			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
  			_alias=$(git describe --match=${_match} 2>/dev/null)
- 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
+ 			_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)

debian/patches/0002-always-load-ZFS-module-on-boot.patch

@@ -15,13 +15,13 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- etc/modules-load.d/zfs.conf.in | 2 +-
+ etc/modules-load.d/zfs.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf
 index 44e1bb3ed..7509b03cb 100644
---- a/etc/modules-load.d/zfs.conf.in
+--- a/etc/modules-load.d/zfs.conf
-+++ b/etc/modules-load.d/zfs.conf.in
++++ b/etc/modules-load.d/zfs.conf
 @@ -1,3 +1,3 @@
  # The default behavior is to allow udev to load the kernel modules on demand.
  # Uncomment the following line to unconditionally load them at boot.

debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch

@@ -13,15 +13,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  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 f4313625e..444e776fd 100644
+index be2fc6734..7606604ec 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
+@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
- Documentation=man:zed(8)
  
  [Service]
+ EnvironmentFile=-@initconfdir@/zfs
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
- Restart=on-abort
+ Restart=always
  
  [Install]

debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch

@@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  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 4aae9f06e..ec5c45e63 100644
+index c5dd45d87..1c792edf0 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
- [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+ EnvironmentFile=-@initconfdir@/zfs
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
  
  [Install]
  WantedBy=zfs-import.target

debian/patches/0005-Enable-zed-emails.patch

@@ -9,23 +9,14 @@ behavior of mdadm.
 
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- cmd/zed/zed.d/zed.rc | 4 ++--
+ cmd/zed/zed.d/zed.rc | 2 +-
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
+index bc269b155..e6d4b1703 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -15,7 +15,7 @@
+@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
- # Email will only be sent if ZED_EMAIL_ADDR is defined.
- # Disabled by default; uncomment to enable.
- #
--#ZED_EMAIL_ADDR="root"
-+ZED_EMAIL_ADDR="root"
- 
- ##
- # Name or path of executable responsible for sending notifications via email;
-@@ -41,7 +41,7 @@
  ##
  # Minimum number of seconds between notifications for a similar event.
  #

debian/patches/0006-dont-symlink-zed-scripts.patch

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Antonio Russo <antonio.e.russo@gmail.com>
+Date: Fri, 20 Mar 2020 17:28:43 +0100
+Subject: [PATCH] dont symlink zed scripts
+
+Of the zedlet scripts shipped by upstream, a subset are enabled by
+default, by creating symlinks in /etc/zfs/zed.d.  These symlinks are
+shipped in the zfs-zed package.  dpkg, however, does not support
+conffile handling of symlinks, and therefore any changes (removals) to
+the symlinks are not preserved on package upgrade.
+
+To address this policy violation, we:
+
+ 1. During package build, create a list of enabled-by-default zedlets,
+    instead of creating symlinks.
+ 2. On package removal, identify all enabled-by-default zedlets whose
+    symlinks do not exist (i.e., were removed by the user). This is done
+    by creating "whiteout" links to /dev/null in their place).
+ 3. On package installation, create links to enabled-by-default zedlets
+    UNLESS there is already a file there (i.e., abort if there is a
+    whiteout link).
+ 4. We also clean up broken symlinks to removed zedlets at package
+    postinst.
+
+Description: track default symlinks, instead of symlinking
+Forwarded: no need
+(cherry picked from https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/5cee380324d7)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ cmd/zed/zed.d/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
+index 812558cf6..f802cf140 100644
+--- a/cmd/zed/zed.d/Makefile.am
++++ b/cmd/zed/zed.d/Makefile.am
+@@ -48,7 +48,7 @@ zed-install-data-hook:
+ 	set -x; for f in $(zedconfdefaults); do \
+ 	  [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
+ 	    [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
+-	    $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
++	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
+ 	done
+ 
+ SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)

debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Tue, 15 Sep 2020 19:07:24 +0200
+Subject: [PATCH] Add systemd-unit for importing specific pools
+
+The unit can be instantiated with a specific poolname, which will get imported
+by scanning /dev/disk/by-id, irrespective of the existence and content of
+/etc/zfs/zpool.cache.
+
+the instance name is used unescaped (see systemd.unit(5)), since zpool names
+can contain characters which will be escaped by systemd.
+
+Its instances are ordered before the other two "big" import services to avoid
+races and spurious (cosmetic!) service failures.
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ etc/Makefile.am                           |  1 +
+ etc/systemd/system/50-zfs.preset          |  1 +
+ etc/systemd/system/zfs-import@.service.in | 18 ++++++++++++++++++
+ 3 files changed, 20 insertions(+)
+ create mode 100644 etc/systemd/system/zfs-import@.service.in
+
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index 7187762d3..de131dc87 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \
+ systemdunit_DATA = \
+ 	%D%/systemd/system/zfs-import-cache.service \
+ 	%D%/systemd/system/zfs-import-scan.service \
++	%D%/systemd/system/zfs-import@.service \
+ 	%D%/systemd/system/zfs-import.target \
+ 	%D%/systemd/system/zfs-mount.service \
+ 	%D%/systemd/system/zfs-scrub-monthly@.timer \
+diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset
+index e4056a92c..030611419 100644
+--- a/etc/systemd/system/50-zfs.preset
++++ b/etc/systemd/system/50-zfs.preset
+@@ -1,6 +1,7 @@
+ # ZFS is enabled by default
+ enable zfs-import-cache.service
+ disable zfs-import-scan.service
++enable zfs-import@.service
+ enable zfs-import.target
+ enable zfs-mount.service
+ 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
+--- /dev/null
++++ b/etc/systemd/system/zfs-import@.service.in
+@@ -0,0 +1,18 @@
++[Unit]
++Description=Import ZFS pool %i
++Documentation=man:zpool(8)
++DefaultDependencies=no
++After=systemd-udev-settle.service
++After=cryptsetup.target
++After=multipathd.target
++Before=zfs-import.target
++Before=zfs-import-scan.service
++Before=zfs-import-cache.service
++
++[Service]
++Type=oneshot
++RemainAfterExit=yes
++ExecStart=@sbindir@/zpool import -N -d /dev/disk/by-id -o cachefile=none %I
++
++[Install]
++WantedBy=zfs-import.target

debian/patches/0008-Linux-4.14-4.19-5.0-compat-SIMD-save-restore.patch

@@ -1,333 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Thu, 3 Oct 2019 00:03:20 +0000
-Subject: [PATCH] Linux 4.14, 4.19, 5.0+ compat: SIMD save/restore
-
-Contrary to initial testing we cannot rely on these kernels to
-invalidate the per-cpu FPU state and restore the FPU registers.
-Therefore, the kfpu_begin() and kfpu_end() functions have been
-updated to unconditionally save and restore the FPU state.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #9346
-(cherry picked from commit 813fd014a90229127f80b970a8fef5049fd4c713)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- config/kernel-fpu.m4     |  82 +++++++++++----------
- include/linux/simd_x86.h | 152 ++++++++++++++++++++++++++++-----------
- 2 files changed, 155 insertions(+), 79 deletions(-)
-
-diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4
-index a2c47d65a..9ed9b14ad 100644
---- a/config/kernel-fpu.m4
-+++ b/config/kernel-fpu.m4
-@@ -2,15 +2,9 @@ dnl #
- dnl # Handle differences in kernel FPU code.
- dnl #
- dnl # Kernel
--dnl # 5.2:	The fpu->initialized flag was replaced by TIF_NEED_FPU_LOAD.
--dnl #		HAVE_KERNEL_TIF_NEED_FPU_LOAD
--dnl #
--dnl # 5.0:	As an optimization SIMD operations performed by kernel
--dnl #		threads can skip saving and restoring their FPU context.
--dnl #		Wrappers have been introduced to determine the running
--dnl #		context and use either the SIMD or generic implementation.
-+dnl # 5.0:	Wrappers have been introduced to save/restore the FPU state.
- dnl #		This change was made to the 4.19.38 and 4.14.120 LTS kernels.
--dnl #		HAVE_KERNEL_FPU_INITIALIZED
-+dnl #		HAVE_KERNEL_FPU_INTERNAL
- dnl #
- dnl # 4.2:	Use __kernel_fpu_{begin,end}()
- dnl #		HAVE_UNDERSCORE_KERNEL_FPU & KERNEL_EXPORTS_X86_FPU
-@@ -61,22 +55,47 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
- 		__kernel_fpu_end();
- 	], [], [$ZFS_META_LICENSE])
- 
--	ZFS_LINUX_TEST_SRC([fpu_initialized], [
--		#include <linux/module.h>
-+	ZFS_LINUX_TEST_SRC([fpu_internal], [
-+		#if defined(__x86_64) || defined(__x86_64__) || \
-+		    defined(__i386) || defined(__i386__)
-+		#if !defined(__x86)
-+		#define __x86
-+		#endif
-+		#endif
-+
-+		#if !defined(__x86)
-+		#error Unsupported architecture
-+		#endif
-+
- 		#include <linux/sched.h>
--	],[
--		struct fpu *fpu = &current->thread.fpu;
--		if (fpu->initialized) { return (0); };
--	])
- 
--	ZFS_LINUX_TEST_SRC([tif_need_fpu_load], [
--		#include <linux/module.h>
--		#include <asm/thread_info.h>
-+		#if !defined(PF_KTHREAD)
-+		#error PF_KTHREAD not defined
-+		#endif
- 
--		#if !defined(TIF_NEED_FPU_LOAD)
--		#error "TIF_NEED_FPU_LOAD undefined"
-+		#ifdef HAVE_KERNEL_FPU_API_HEADER
-+		#include <asm/fpu/api.h>
-+		#include <asm/fpu/internal.h>
-+		#else
-+		#include <asm/i387.h>
-+		#include <asm/xcr.h>
-+		#endif
-+
-+		#if !defined(XSTATE_XSAVE)
-+		#error XSTATE_XSAVE not defined
-+		#endif
-+
-+		#if !defined(XSTATE_XRESTORE)
-+		#error XSTATE_XRESTORE not defined
- 		#endif
--	],[])
-+	],[
-+		struct fpu *fpu = &current->thread.fpu;
-+		union fpregs_state *st = &fpu->state;
-+		struct fregs_state *fr __attribute__ ((unused)) = &st->fsave;
-+		struct fxregs_state *fxr __attribute__ ((unused)) = &st->fxsave;
-+		struct xregs_state *xr __attribute__ ((unused)) = &st->xsave;
-+		fpu->last_cpu = -1;
-+	])
- ])
- 
- AC_DEFUN([ZFS_AC_KERNEL_FPU], [
-@@ -104,25 +123,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
- 			AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
- 			    [kernel exports FPU functions])
- 		],[
--			dnl #
--			dnl # Linux 5.0 kernel
--			dnl #
--			ZFS_LINUX_TEST_RESULT([fpu_initialized], [
--				AC_MSG_RESULT(fpu.initialized)
--				AC_DEFINE(HAVE_KERNEL_FPU_INITIALIZED, 1,
--				    [kernel fpu.initialized exists])
-+			ZFS_LINUX_TEST_RESULT([fpu_internal], [
-+				AC_MSG_RESULT(internal)
-+				AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
-+				    [kernel fpu internal])
- 			],[
--				dnl #
--				dnl # Linux 5.2 kernel
--				dnl #
--				ZFS_LINUX_TEST_RESULT([tif_need_fpu_load], [
--					AC_MSG_RESULT(TIF_NEED_FPU_LOAD)
--					AC_DEFINE(
--					    HAVE_KERNEL_TIF_NEED_FPU_LOAD, 1,
--					    [kernel TIF_NEED_FPU_LOAD exists])
--				],[
--					AC_MSG_RESULT(unavailable)
--				])
-+				AC_MSG_RESULT(unavailable)
- 			])
- 		])
- 	])
-diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
-index 641f43955..d1ded3af2 100644
---- a/include/linux/simd_x86.h
-+++ b/include/linux/simd_x86.h
-@@ -126,38 +126,68 @@
- #endif
- 
- #else /* defined(KERNEL_EXPORTS_X86_FPU) */
-+
- /*
-  * When the kernel_fpu_* symbols are unavailable then provide our own
-  * versions which allow the FPU to be safely used in kernel threads.
-  * In practice, this is not a significant restriction for ZFS since the
-  * vast majority of SIMD operations are performed by the IO pipeline.
-  */
-+#if defined(HAVE_KERNEL_FPU_INTERNAL)
- 
- /*
-- * Returns non-zero if FPU operations are allowed in the current context.
-+ * FPU usage only allowed in dedicated kernel threads.
-  */
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
--#define	kfpu_allowed()		((current->flags & PF_KTHREAD) && \
--				test_thread_flag(TIF_NEED_FPU_LOAD))
--#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
--#define	kfpu_allowed()		((current->flags & PF_KTHREAD) && \
--				current->thread.fpu.initialized)
--#else
--#define	kfpu_allowed()		0
--#endif
-+#define	kfpu_allowed()		(current->flags & PF_KTHREAD)
-+#define	ex_handler_fprestore	ex_handler_default
-+
-+/*
-+ * FPU save and restore instructions.
-+ */
-+#define	__asm			__asm__ __volatile__
-+#define	kfpu_fxsave(addr)	__asm("fxsave %0" : "=m" (*(addr)))
-+#define	kfpu_fxsaveq(addr)	__asm("fxsaveq %0" : "=m" (*(addr)))
-+#define	kfpu_fnsave(addr)	__asm("fnsave %0; fwait" : "=m" (*(addr)))
-+#define	kfpu_fxrstor(addr)	__asm("fxrstor %0" : : "m" (*(addr)))
-+#define	kfpu_fxrstorq(addr)	__asm("fxrstorq %0" : : "m" (*(addr)))
-+#define	kfpu_frstor(addr)	__asm("frstor %0" : : "m" (*(addr)))
-+#define	kfpu_fxsr_clean(rval)	__asm("fnclex; emms; fildl %P[addr]" \
-+				    : : [addr] "m" (rval));
- 
- static inline void
- kfpu_initialize(void)
- {
- 	WARN_ON_ONCE(!(current->flags & PF_KTHREAD));
- 
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
--	__fpu_invalidate_fpregs_state(&current->thread.fpu);
--	set_thread_flag(TIF_NEED_FPU_LOAD);
--#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
--	__fpu_invalidate_fpregs_state(&current->thread.fpu);
--	current->thread.fpu.initialized = 1;
--#endif
-+	/* Invalidate the task's FPU state */
-+	current->thread.fpu.last_cpu = -1;
-+}
-+
-+static inline void
-+kfpu_save_xsave(struct xregs_state *addr, uint64_t mask)
-+{
-+	uint32_t low, hi;
-+	int err;
-+
-+	low = mask;
-+	hi = mask >> 32;
-+	XSTATE_XSAVE(addr, low, hi, err);
-+	WARN_ON_ONCE(err);
-+}
-+
-+static inline void
-+kfpu_save_fxsr(struct fxregs_state *addr)
-+{
-+	if (IS_ENABLED(CONFIG_X86_32))
-+		kfpu_fxsave(addr);
-+	else
-+		kfpu_fxsaveq(addr);
-+}
-+
-+static inline void
-+kfpu_save_fsave(struct fregs_state *addr)
-+{
-+	kfpu_fnsave(addr);
- }
- 
- static inline void
-@@ -172,46 +202,86 @@ kfpu_begin(void)
- 	preempt_disable();
- 	local_irq_disable();
- 
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
- 	/*
- 	 * The current FPU registers need to be preserved by kfpu_begin()
--	 * and restored by kfpu_end().  This is required because we can
--	 * not call __cpu_invalidate_fpregs_state() to invalidate the
--	 * per-cpu FPU state and force them to be restored during a
--	 * context switch.
-+	 * and restored by kfpu_end().  This is always required because we
-+	 * can not call __cpu_invalidate_fpregs_state() to invalidate the
-+	 * per-cpu FPU state and force them to be restored.  Furthermore,
-+	 * this implementation relies on the space provided in the task
-+	 * structure to store the user FPU state.  As such, it can only
-+	 * be used with dedicated kernels which by definition will never
-+	 * store user FPU state.
- 	 */
--	copy_fpregs_to_fpstate(&current->thread.fpu);
--#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
-+	if (static_cpu_has(X86_FEATURE_XSAVE)) {
-+		kfpu_save_xsave(&current->thread.fpu.state.xsave, ~0);
-+	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
-+		kfpu_save_fxsr(&current->thread.fpu.state.fxsave);
-+	} else {
-+		kfpu_save_fsave(&current->thread.fpu.state.fsave);
-+	}
-+}
-+
-+static inline void
-+kfpu_restore_xsave(struct xregs_state *addr, uint64_t mask)
-+{
-+	uint32_t low, hi;
-+
-+	low = mask;
-+	hi = mask >> 32;
-+	XSTATE_XRESTORE(addr, low, hi);
-+}
-+
-+static inline void
-+kfpu_restore_fxsr(struct fxregs_state *addr)
-+{
- 	/*
--	 * There is no need to preserve and restore the FPU registers.
--	 * They will always be restored from the task's stored FPU state
--	 * when switching contexts.
-+	 * On AuthenticAMD K7 and K8 processors the fxrstor instruction only
-+	 * restores the _x87 FOP, FIP, and FDP registers when an exception
-+	 * is pending.  Clean the _x87 state to force the restore.
- 	 */
--	WARN_ON_ONCE(current->thread.fpu.initialized == 0);
--#endif
-+	if (unlikely(static_cpu_has_bug(X86_BUG_FXSAVE_LEAK)))
-+		kfpu_fxsr_clean(addr);
-+
-+	if (IS_ENABLED(CONFIG_X86_32)) {
-+		kfpu_fxrstor(addr);
-+	} else {
-+		kfpu_fxrstorq(addr);
-+	}
- }
- 
- static inline void
--kfpu_end(void)
-+kfpu_restore_fsave(struct fregs_state *addr)
- {
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
--	union fpregs_state *state = &current->thread.fpu.state;
--	int error;
-+	kfpu_frstor(addr);
-+}
- 
--	if (use_xsave()) {
--		error = copy_kernel_to_xregs_err(&state->xsave, -1);
--	} else if (use_fxsr()) {
--		error = copy_kernel_to_fxregs_err(&state->fxsave);
-+static inline void
-+kfpu_end(void)
-+{
-+	if (static_cpu_has(X86_FEATURE_XSAVE)) {
-+		kfpu_restore_xsave(&current->thread.fpu.state.xsave, ~0);
-+	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
-+		kfpu_restore_fxsr(&current->thread.fpu.state.fxsave);
- 	} else {
--		error = copy_kernel_to_fregs_err(&state->fsave);
-+		kfpu_restore_fsave(&current->thread.fpu.state.fsave);
- 	}
--	WARN_ON_ONCE(error);
--#endif
- 
- 	local_irq_enable();
- 	preempt_enable();
- }
--#endif /* defined(HAVE_KERNEL_FPU) */
-+
-+#else
-+
-+/*
-+ * FPU support is unavailable.
-+ */
-+#define	kfpu_allowed()		0
-+#define	kfpu_initialize(tsk)	do {} while (0)
-+#define	kfpu_begin()		do {} while (0)
-+#define	kfpu_end()		do {} while (0)
-+
-+#endif /* defined(HAVE_KERNEL_FPU_INTERNAL) */
-+#endif /* defined(KERNEL_EXPORTS_X86_FPU) */
- 
- #else /* defined(_KERNEL) */
- /*

debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Thu, 4 Feb 2021 19:01:12 +0100
+Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
+
+Originally-By: Mo Zhou <cdluminate@gmail.com>
+Originally-By: Antonio Russo <aerusso@aerusso.net>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ 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 43bb014dd..a9293468a 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 82358fa68..a8fb55498 100644
+--- a/man/man1/arcstat.1
++++ b/man/man8/arcstat.8
+@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
+ .\"
+ .Dd December 23, 2022
+-.Dt ARCSTAT 1
++.Dt ARCSTAT 8
+ .Os
+ .
+ .Sh NAME

debian/patches/0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 17 Jul 2019 09:14:36 -0700
-Subject: [PATCH] Fix CONFIG_X86_DEBUG_FPU build failure
-
-When CONFIG_X86_DEBUG_FPU is defined the alternatives_patched symbol
-is pulled in as a dependency which results in a build failure.  To
-prevent this undefine CONFIG_X86_DEBUG_FPU to disable the WARN_ON_FPU()
-macro and rely on WARN_ON_ONCE debugging checks which were previously
-added.
-
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #9041
-Closes #9049
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- include/linux/simd_x86.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
-index d1ded3af2..b32bccc41 100644
---- a/include/linux/simd_x86.h
-+++ b/include/linux/simd_x86.h
-@@ -84,6 +84,15 @@
- 
- #if defined(_KERNEL)
- 
-+/*
-+ * Disable the WARN_ON_FPU() macro to prevent additional dependencies
-+ * when providing the kfpu_* functions.  Relevant warnings are included
-+ * as appropriate and are unconditionally enabled.
-+ */
-+#if defined(CONFIG_X86_DEBUG_FPU) && !defined(KERNEL_EXPORTS_X86_FPU)
-+#undef CONFIG_X86_DEBUG_FPU
-+#endif
-+
- #if defined(HAVE_KERNEL_FPU_API_HEADER)
- #include <asm/fpu/api.h>
- #include <asm/fpu/internal.h>

debian/patches/0009-arc-stat-summary-guard-access-to-freshly-introduced-.patch

@@ -0,0 +1,438 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Wed, 10 Nov 2021 09:29:47 +0100
+Subject: [PATCH] arc stat/summary: guard access to freshly introduced stats
+
+l2arc MFU/MRU and zfetch past future and stride stats were introduced
+in 2.1 and 2.2.4 respectively:
+
+commit 085321621e79a75bea41c2b6511da6ebfbf2ba0a added printing MFU
+and MRU stats for 2.1 user space tools, but those keys are not
+available in the 2.0 module. That means it may break the arcstat and
+arc_summary tools after upgrade to 2.1 (user space), before a reboot
+to the new 2.1 ZFS kernel-module happened, due to python raising a
+KeyError on the dict access then.
+
+Move those two keys to a .get accessor with `0` as fallback, as it
+should be better to show some possible wrong data for new stat-keys
+than throwing an exception.
+
+also move l2_mfu_asize  l2_mru_asize l2_prefetch_asize
+l2_bufc_data_asize l2_bufc_metadata_asize to .get accessor
+(these are only present with a cache device in the pool)
+
+guard access to iohits and uncached state introduced in
+792a6ee462efc15a7614f27e13f0f8aaa9414a08
+
+guard access to zfetch past future stride stats introduced in
+026fe796465e3da7b27d06ef5338634ee6dd30d8
+
+These are present in the current kernel, but lead to an exception, if
+running the new user-space with an old kernel module.
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ cmd/arc_summary | 132 ++++++++++++++++++++++++------------------------
+ cmd/arcstat.in  |  48 +++++++++---------
+ 2 files changed, 90 insertions(+), 90 deletions(-)
+
+diff --git a/cmd/arc_summary b/cmd/arc_summary
+index 100fb1987..30f5d23e9 100755
+--- a/cmd/arc_summary
++++ b/cmd/arc_summary
+@@ -551,21 +551,21 @@ def section_arc(kstats_dict):
+     arc_target_size = arc_stats['c']
+     arc_max = arc_stats['c_max']
+     arc_min = arc_stats['c_min']
+-    meta = arc_stats['meta']
+-    pd = arc_stats['pd']
+-    pm = arc_stats['pm']
+-    anon_data = arc_stats['anon_data']
+-    anon_metadata = arc_stats['anon_metadata']
+-    mfu_data = arc_stats['mfu_data']
+-    mfu_metadata = arc_stats['mfu_metadata']
+-    mru_data = arc_stats['mru_data']
+-    mru_metadata = arc_stats['mru_metadata']
+-    mfug_data = arc_stats['mfu_ghost_data']
+-    mfug_metadata = arc_stats['mfu_ghost_metadata']
+-    mrug_data = arc_stats['mru_ghost_data']
+-    mrug_metadata = arc_stats['mru_ghost_metadata']
+-    unc_data = arc_stats['uncached_data']
+-    unc_metadata = arc_stats['uncached_metadata']
++    meta = arc_stats.get('meta', 0)
++    pd = arc_stats.get('pd', 0)
++    pm = arc_stats.get('pm', 0)
++    anon_data = arc_stats.get('anon_data', 0)
++    anon_metadata = arc_stats.get('anon_metadata', 0)
++    mfu_data = arc_stats.get('mfu_data', 0)
++    mfu_metadata = arc_stats.get('mfu_metadata', 0)
++    mru_data = arc_stats.get('mru_data', 0)
++    mru_metadata = arc_stats.get('mru_metadata', 0)
++    mfug_data = arc_stats.get('mfu_ghost_data', 0)
++    mfug_metadata = arc_stats.get('mfu_ghost_metadata', 0)
++    mrug_data = arc_stats.get('mru_ghost_data', 0)
++    mrug_metadata = arc_stats.get('mru_ghost_metadata', 0)
++    unc_data = arc_stats.get('uncached_data', 0)
++    unc_metadata = arc_stats.get('uncached_metadata', 0)
+     bonus_size = arc_stats['bonus_size']
+     dnode_limit = arc_stats['arc_dnode_limit']
+     dnode_size = arc_stats['dnode_size']
+@@ -655,13 +655,13 @@ def section_arc(kstats_dict):
+     prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
+     prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
+     prt_i2('L2 eligible MFU evictions:',
+-           f_perc(arc_stats['evict_l2_eligible_mfu'],
++           f_perc(arc_stats.get('evict_l2_eligible_mfu', 0), # 2.0 module compat
+            arc_stats['evict_l2_eligible']),
+-           f_bytes(arc_stats['evict_l2_eligible_mfu']))
++           f_bytes(arc_stats.get('evict_l2_eligible_mfu', 0)))
+     prt_i2('L2 eligible MRU evictions:',
+-           f_perc(arc_stats['evict_l2_eligible_mru'],
++           f_perc(arc_stats.get('evict_l2_eligible_mru', 0), # 2.0 module compat
+            arc_stats['evict_l2_eligible']),
+-           f_bytes(arc_stats['evict_l2_eligible_mru']))
++           f_bytes(arc_stats.get('evict_l2_eligible_mru', 0)))
+     prt_i1('L2 ineligible evictions:',
+            f_bytes(arc_stats['evict_l2_ineligible']))
+     print()
+@@ -672,106 +672,106 @@ def section_archits(kstats_dict):
+     """
+ 
+     arc_stats = isolate_section('arcstats', kstats_dict)
+-    all_accesses = int(arc_stats['hits'])+int(arc_stats['iohits'])+\
++    all_accesses = int(arc_stats['hits'])+int(arc_stats.get('iohits', 0))+\
+         int(arc_stats['misses'])
+ 
+     prt_1('ARC total accesses:', f_hits(all_accesses))
+     ta_todo = (('Total hits:', arc_stats['hits']),
+-               ('Total I/O hits:', arc_stats['iohits']),
++               ('Total I/O hits:', arc_stats.get('iohits', 0)),
+                ('Total misses:', arc_stats['misses']))
+     for title, value in ta_todo:
+         prt_i2(title, f_perc(value, all_accesses), f_hits(value))
+     print()
+ 
+     dd_total = int(arc_stats['demand_data_hits']) +\
+-        int(arc_stats['demand_data_iohits']) +\
++        int(arc_stats.get('demand_data_iohits', 0)) +\
+         int(arc_stats['demand_data_misses'])
+     prt_2('ARC demand data accesses:', f_perc(dd_total, all_accesses),
+          f_hits(dd_total))
+     dd_todo = (('Demand data hits:', arc_stats['demand_data_hits']),
+-               ('Demand data I/O hits:', arc_stats['demand_data_iohits']),
++               ('Demand data I/O hits:', arc_stats.get('demand_data_iohits', 0)),
+                ('Demand data misses:', arc_stats['demand_data_misses']))
+     for title, value in dd_todo:
+         prt_i2(title, f_perc(value, dd_total), f_hits(value))
+     print()
+ 
+     dm_total = int(arc_stats['demand_metadata_hits']) +\
+-        int(arc_stats['demand_metadata_iohits']) +\
++        int(arc_stats.get('demand_metadata_iohits', 0)) +\
+         int(arc_stats['demand_metadata_misses'])
+     prt_2('ARC demand metadata accesses:', f_perc(dm_total, all_accesses),
+           f_hits(dm_total))
+     dm_todo = (('Demand metadata hits:', arc_stats['demand_metadata_hits']),
+                ('Demand metadata I/O hits:',
+-                arc_stats['demand_metadata_iohits']),
++                arc_stats.get('demand_metadata_iohits', 0)),
+                ('Demand metadata misses:', arc_stats['demand_metadata_misses']))
+     for title, value in dm_todo:
+         prt_i2(title, f_perc(value, dm_total), f_hits(value))
+     print()
+ 
+     pd_total = int(arc_stats['prefetch_data_hits']) +\
+-        int(arc_stats['prefetch_data_iohits']) +\
++        int(arc_stats.get('prefetch_data_iohits', 0)) +\
+         int(arc_stats['prefetch_data_misses'])
+     prt_2('ARC prefetch data accesses:', f_perc(pd_total, all_accesses),
+           f_hits(pd_total))
+     pd_todo = (('Prefetch data hits:', arc_stats['prefetch_data_hits']),
+-               ('Prefetch data I/O hits:', arc_stats['prefetch_data_iohits']),
++               ('Prefetch data I/O hits:', arc_stats.get('prefetch_data_iohits', 0)),
+                ('Prefetch data misses:', arc_stats['prefetch_data_misses']))
+     for title, value in pd_todo:
+         prt_i2(title, f_perc(value, pd_total), f_hits(value))
+     print()
+ 
+     pm_total = int(arc_stats['prefetch_metadata_hits']) +\
+-        int(arc_stats['prefetch_metadata_iohits']) +\
++        int(arc_stats.get('prefetch_metadata_iohits', 0)) +\
+         int(arc_stats['prefetch_metadata_misses'])
+     prt_2('ARC prefetch metadata accesses:', f_perc(pm_total, all_accesses),
+           f_hits(pm_total))
+     pm_todo = (('Prefetch metadata hits:',
+                 arc_stats['prefetch_metadata_hits']),
+                ('Prefetch metadata I/O hits:',
+-                arc_stats['prefetch_metadata_iohits']),
++                arc_stats.get('prefetch_metadata_iohits', 0)),
+                ('Prefetch metadata misses:',
+                 arc_stats['prefetch_metadata_misses']))
+     for title, value in pm_todo:
+         prt_i2(title, f_perc(value, pm_total), f_hits(value))
+     print()
+ 
+-    all_prefetches = int(arc_stats['predictive_prefetch'])+\
+-        int(arc_stats['prescient_prefetch'])
++    all_prefetches = int(arc_stats.get('predictive_prefetch', 0))+\
++        int(arc_stats.get('prescient_prefetch', 0))
+     prt_2('ARC predictive prefetches:',
+-           f_perc(arc_stats['predictive_prefetch'], all_prefetches),
+-           f_hits(arc_stats['predictive_prefetch']))
++           f_perc(arc_stats.get('predictive_prefetch', 0), all_prefetches),
++           f_hits(arc_stats.get('predictive_prefetch', 0)))
+     prt_i2('Demand hits after predictive:',
+            f_perc(arc_stats['demand_hit_predictive_prefetch'],
+-                  arc_stats['predictive_prefetch']),
++                  arc_stats.get('predictive_prefetch', 0)),
+            f_hits(arc_stats['demand_hit_predictive_prefetch']))
+     prt_i2('Demand I/O hits after predictive:',
+-           f_perc(arc_stats['demand_iohit_predictive_prefetch'],
+-                  arc_stats['predictive_prefetch']),
+-           f_hits(arc_stats['demand_iohit_predictive_prefetch']))
+-    never = int(arc_stats['predictive_prefetch']) -\
++           f_perc(arc_stats.get('demand_iohit_predictive_prefetch', 0),
++                  arc_stats.get('predictive_prefetch', 0)),
++           f_hits(arc_stats.get('demand_iohit_predictive_prefetch', 0)))
++    never = int(arc_stats.get('predictive_prefetch', 0)) -\
+         int(arc_stats['demand_hit_predictive_prefetch']) -\
+-        int(arc_stats['demand_iohit_predictive_prefetch'])
++        int(arc_stats.get('demand_iohit_predictive_prefetch', 0))
+     prt_i2('Never demanded after predictive:',
+-           f_perc(never, arc_stats['predictive_prefetch']),
++           f_perc(never, arc_stats.get('predictive_prefetch', 0)),
+            f_hits(never))
+     print()
+ 
+     prt_2('ARC prescient prefetches:',
+-           f_perc(arc_stats['prescient_prefetch'], all_prefetches),
+-           f_hits(arc_stats['prescient_prefetch']))
++           f_perc(arc_stats.get('prescient_prefetch', 0), all_prefetches),
++           f_hits(arc_stats.get('prescient_prefetch', 0)))
+     prt_i2('Demand hits after prescient:',
+            f_perc(arc_stats['demand_hit_prescient_prefetch'],
+-                  arc_stats['prescient_prefetch']),
++                  arc_stats.get('prescient_prefetch', 0)),
+            f_hits(arc_stats['demand_hit_prescient_prefetch']))
+     prt_i2('Demand I/O hits after prescient:',
+-           f_perc(arc_stats['demand_iohit_prescient_prefetch'],
+-                  arc_stats['prescient_prefetch']),
+-           f_hits(arc_stats['demand_iohit_prescient_prefetch']))
+-    never = int(arc_stats['prescient_prefetch'])-\
++           f_perc(arc_stats.get('demand_iohit_prescient_prefetch', 0),
++                  arc_stats.get('prescient_prefetch', 0)),
++           f_hits(arc_stats.get('demand_iohit_prescient_prefetch', 0)))
++    never = int(arc_stats.get('prescient_prefetch', 0))-\
+         int(arc_stats['demand_hit_prescient_prefetch'])-\
+-        int(arc_stats['demand_iohit_prescient_prefetch'])
++        int(arc_stats.get('demand_iohit_prescient_prefetch', 0))
+     prt_i2('Never demanded after prescient:',
+-           f_perc(never, arc_stats['prescient_prefetch']),
++           f_perc(never, arc_stats.get('prescient_prefetch', 0)),
+            f_hits(never))
+     print()
+ 
+@@ -782,7 +782,7 @@ def section_archits(kstats_dict):
+                 arc_stats['mfu_ghost_hits']),
+                ('Most recently used (MRU) ghost:',
+                 arc_stats['mru_ghost_hits']),
+-               ('Uncached:', arc_stats['uncached_hits']))
++               ('Uncached:', arc_stats.get('uncached_hits', 0)))
+     for title, value in cl_todo:
+         prt_i2(title, f_perc(value, all_accesses), f_hits(value))
+     print()
+@@ -794,26 +794,26 @@ def section_dmu(kstats_dict):
+     zfetch_stats = isolate_section('zfetchstats', kstats_dict)
+ 
+     zfetch_access_total = int(zfetch_stats['hits']) +\
+-        int(zfetch_stats['future']) + int(zfetch_stats['stride']) +\
+-        int(zfetch_stats['past']) + int(zfetch_stats['misses'])
++        int(zfetch_stats.get('future', 0)) + int(zfetch_stats.get('stride', 0)) +\
++        int(zfetch_stats.get('past', 0)) + int(zfetch_stats['misses'])
+ 
+     prt_1('DMU predictive prefetcher calls:', f_hits(zfetch_access_total))
+     prt_i2('Stream hits:',
+            f_perc(zfetch_stats['hits'], zfetch_access_total),
+            f_hits(zfetch_stats['hits']))
+-    future = int(zfetch_stats['future']) + int(zfetch_stats['stride'])
++    future = int(zfetch_stats.get('future', 0)) + int(zfetch_stats.get('stride', 0))
+     prt_i2('Hits ahead of stream:', f_perc(future, zfetch_access_total),
+            f_hits(future))
+     prt_i2('Hits behind stream:',
+-           f_perc(zfetch_stats['past'], zfetch_access_total),
+-           f_hits(zfetch_stats['past']))
++           f_perc(zfetch_stats.get('past', 0), zfetch_access_total),
++           f_hits(zfetch_stats.get('past', 0)))
+     prt_i2('Stream misses:',
+            f_perc(zfetch_stats['misses'], zfetch_access_total),
+            f_hits(zfetch_stats['misses']))
+     prt_i2('Streams limit reached:',
+            f_perc(zfetch_stats['max_streams'], zfetch_stats['misses']),
+            f_hits(zfetch_stats['max_streams']))
+-    prt_i1('Stream strides:', f_hits(zfetch_stats['stride']))
++    prt_i1('Stream strides:', f_hits(zfetch_stats.get('stride', 0)))
+     prt_i1('Prefetches issued', f_hits(zfetch_stats['io_issued']))
+     print()
+ 
+@@ -860,20 +860,20 @@ def section_l2arc(kstats_dict):
+            f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
+            f_bytes(arc_stats['l2_hdr_size']))
+     prt_i2('MFU allocated size:',
+-           f_perc(arc_stats['l2_mfu_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_mfu_asize']))
++           f_perc(arc_stats.get('l2_mfu_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_mfu_asize', 0))) # 2.0 module compat
+     prt_i2('MRU allocated size:',
+-           f_perc(arc_stats['l2_mru_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_mru_asize']))
++           f_perc(arc_stats.get('l2_mru_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_mru_asize', 0))) # 2.0 module compat
+     prt_i2('Prefetch allocated size:',
+-           f_perc(arc_stats['l2_prefetch_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_prefetch_asize']))
++           f_perc(arc_stats.get('l2_prefetch_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_prefetch_asize',0))) # 2.0 module compat
+     prt_i2('Data (buffer content) allocated size:',
+-           f_perc(arc_stats['l2_bufc_data_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_bufc_data_asize']))
++           f_perc(arc_stats.get('l2_bufc_data_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_bufc_data_asize', 0))) # 2.0 module compat
+     prt_i2('Metadata (buffer content) allocated size:',
+-           f_perc(arc_stats['l2_bufc_metadata_asize'], arc_stats['l2_asize']),
+-           f_bytes(arc_stats['l2_bufc_metadata_asize']))
++           f_perc(arc_stats.get('l2_bufc_metadata_asize', 0), arc_stats['l2_asize']),
++           f_bytes(arc_stats.get('l2_bufc_metadata_asize', 0))) # 2.0 module compat
+ 
+     print()
+     prt_1('L2ARC breakdown:', f_hits(l2_access_total))
+diff --git a/cmd/arcstat.in b/cmd/arcstat.in
+index c4f10a1d6..bf47ec90e 100755
+--- a/cmd/arcstat.in
++++ b/cmd/arcstat.in
+@@ -510,7 +510,7 @@ def calculate():
+     v = dict()
+     v["time"] = time.strftime("%H:%M:%S", time.localtime())
+     v["hits"] = d["hits"] // sint
+-    v["iohs"] = d["iohits"] // sint
++    v["iohs"] = d.get("iohits", 0) // sint
+     v["miss"] = d["misses"] // sint
+     v["read"] = v["hits"] + v["iohs"] + v["miss"]
+     v["hit%"] = 100 * v["hits"] // v["read"] if v["read"] > 0 else 0
+@@ -518,7 +518,7 @@ def calculate():
+     v["miss%"] = 100 - v["hit%"] - v["ioh%"] if v["read"] > 0 else 0
+ 
+     v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) // sint
+-    v["dioh"] = (d["demand_data_iohits"] + d["demand_metadata_iohits"]) // sint
++    v["dioh"] = (d.get("demand_data_iohits", 0) + d.get("demand_metadata_iohits", 0)) // sint
+     v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) // sint
+ 
+     v["dread"] = v["dhit"] + v["dioh"] + v["dmis"]
+@@ -527,7 +527,7 @@ def calculate():
+     v["dm%"] = 100 - v["dh%"] - v["di%"] if v["dread"] > 0 else 0
+ 
+     v["ddhit"] = d["demand_data_hits"] // sint
+-    v["ddioh"] = d["demand_data_iohits"] // sint
++    v["ddioh"] = d.get("demand_data_iohits", 0) // sint
+     v["ddmis"] = d["demand_data_misses"] // sint
+ 
+     v["ddread"] = v["ddhit"] + v["ddioh"] + v["ddmis"]
+@@ -536,7 +536,7 @@ def calculate():
+     v["ddm%"] = 100 - v["ddh%"] - v["ddi%"] if v["ddread"] > 0 else 0
+ 
+     v["dmhit"] = d["demand_metadata_hits"] // sint
+-    v["dmioh"] = d["demand_metadata_iohits"] // sint
++    v["dmioh"] = d.get("demand_metadata_iohits", 0) // sint
+     v["dmmis"] = d["demand_metadata_misses"] // sint
+ 
+     v["dmread"] = v["dmhit"] + v["dmioh"] + v["dmmis"]
+@@ -545,8 +545,8 @@ def calculate():
+     v["dmm%"] = 100 - v["dmh%"] - v["dmi%"] if v["dmread"] > 0 else 0
+ 
+     v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) // sint
+-    v["pioh"] = (d["prefetch_data_iohits"] +
+-                 d["prefetch_metadata_iohits"]) // sint
++    v["pioh"] = (d.get("prefetch_data_iohits", 0) +
++                 d.get("prefetch_metadata_iohits", 0)) // sint
+     v["pmis"] = (d["prefetch_data_misses"] +
+                  d["prefetch_metadata_misses"]) // sint
+ 
+@@ -556,7 +556,7 @@ def calculate():
+     v["pm%"] = 100 - v["ph%"] - v["pi%"] if v["pread"] > 0 else 0
+ 
+     v["pdhit"] = d["prefetch_data_hits"] // sint
+-    v["pdioh"] = d["prefetch_data_iohits"] // sint
++    v["pdioh"] = d.get("prefetch_data_iohits", 0) // sint
+     v["pdmis"] = d["prefetch_data_misses"] // sint
+ 
+     v["pdread"] = v["pdhit"] + v["pdioh"] + v["pdmis"]
+@@ -565,7 +565,7 @@ def calculate():
+     v["pdm%"] = 100 - v["pdh%"] - v["pdi%"] if v["pdread"] > 0 else 0
+ 
+     v["pmhit"] = d["prefetch_metadata_hits"] // sint
+-    v["pmioh"] = d["prefetch_metadata_iohits"] // sint
++    v["pmioh"] = d.get("prefetch_metadata_iohits", 0) // sint
+     v["pmmis"] = d["prefetch_metadata_misses"] // sint
+ 
+     v["pmread"] = v["pmhit"] + v["pmioh"] + v["pmmis"]
+@@ -575,8 +575,8 @@ def calculate():
+ 
+     v["mhit"] = (d["prefetch_metadata_hits"] +
+                  d["demand_metadata_hits"]) // sint
+-    v["mioh"] = (d["prefetch_metadata_iohits"] +
+-                 d["demand_metadata_iohits"]) // sint
++    v["mioh"] = (d.get("prefetch_metadata_iohits", 0) +
++                 d.get("demand_metadata_iohits", 0)) // sint
+     v["mmis"] = (d["prefetch_metadata_misses"] +
+                  d["demand_metadata_misses"]) // sint
+ 
+@@ -592,24 +592,24 @@ def calculate():
+     v["mru"] = d["mru_hits"] // sint
+     v["mrug"] = d["mru_ghost_hits"] // sint
+     v["mfug"] = d["mfu_ghost_hits"] // sint
+-    v["unc"] = d["uncached_hits"] // sint
++    v["unc"] = d.get("uncached_hits", 0) // sint
+     v["eskip"] = d["evict_skip"] // sint
+     v["el2skip"] = d["evict_l2_skip"] // sint
+     v["el2cach"] = d["evict_l2_cached"] // sint
+     v["el2el"] = d["evict_l2_eligible"] // sint
+-    v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
+-    v["el2mru"] = d["evict_l2_eligible_mru"] // sint
++    v["el2mfu"] = d.get("evict_l2_eligible_mfu", 0) // sint
++    v["el2mru"] = d.get("evict_l2_eligible_mru", 0) // sint
+     v["el2inel"] = d["evict_l2_ineligible"] // sint
+     v["mtxmis"] = d["mutex_miss"] // sint
+-    v["ztotal"] = (d["zfetch_hits"] + d["zfetch_future"] + d["zfetch_stride"] +
+-                   d["zfetch_past"] + d["zfetch_misses"]) // sint
++    v["ztotal"] = (d["zfetch_hits"] + d.get("zfetch_future", 0) + d.get("zfetch_stride", 0) +
++                   d.get("zfetch_past", 0) + d["zfetch_misses"]) // sint
+     v["zhits"] = d["zfetch_hits"] // sint
+-    v["zahead"] = (d["zfetch_future"] + d["zfetch_stride"]) // sint
+-    v["zpast"] = d["zfetch_past"] // sint
++    v["zahead"] = (d.get("zfetch_future", 0) + d.get("zfetch_stride", 0)) // sint
++    v["zpast"] = d.get("zfetch_past", 0) // sint
+     v["zmisses"] = d["zfetch_misses"] // sint
+     v["zmax"] = d["zfetch_max_streams"] // sint
+-    v["zfuture"] = d["zfetch_future"] // sint
+-    v["zstride"] = d["zfetch_stride"] // sint
++    v["zfuture"] = d.get("zfetch_future", 0) // sint
++    v["zstride"] = d.get("zfetch_stride", 0) // sint
+     v["zissued"] = d["zfetch_io_issued"] // sint
+     v["zactive"] = d["zfetch_io_active"] // sint
+ 
+@@ -624,11 +624,11 @@ def calculate():
+         v["l2size"] = cur["l2_size"]
+         v["l2bytes"] = d["l2_read_bytes"] // sint
+ 
+-        v["l2pref"] = cur["l2_prefetch_asize"]
+-        v["l2mfu"] = cur["l2_mfu_asize"]
+-        v["l2mru"] = cur["l2_mru_asize"]
+-        v["l2data"] = cur["l2_bufc_data_asize"]
+-        v["l2meta"] = cur["l2_bufc_metadata_asize"]
++        v["l2pref"] = cur.get("l2_prefetch_asize", 0)
++        v["l2mfu"] = cur.get("l2_mfu_asize", 0)
++        v["l2mru"] = cur.get("l2_mru_asize", 0)
++        v["l2data"] = cur.get("l2_bufc_data_asize", 0)
++        v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
+         v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
+         v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
+         v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]

debian/patches/0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: siv0 <github@nomore.at>
+Date: Tue, 31 Oct 2023 21:57:54 +0100
+Subject: [PATCH] Fix nfs_truncate_shares without /etc/exports.d
+
+Calling nfs_reset_shares on Linux prints a warning:
+`failed to lock /etc/exports.d/zfs.exports.lock: No such file or
+directory`
+when /etc/exports.d does not exist. The directory gets created, when a
+filesystem is actually exported through nfs_toggle_share and
+nfs_init_share. The truncation of /etc/exports.d/zfs.exports happens
+unconditionally when calling `zfs mount -a` (via zfs_do_mount and
+share_mount in `cmd/zfs/zfs_main.c`).
+
+Fixing the issue only in the Linux part, since the exports file on
+freebsd is in `/etc/zfs/`, which seems present on 2 FreeBSD systems I
+have access to (through `/etc/zfs/compatibility.d/`), while a Debian
+box does not have the directory even if `/usr/sbin/exportfs` is
+present through the `nfs-kernel-server` package.
+
+The code for exports_available is copied from nfs_available above.
+
+Fixes: ede037cda73675f42b1452187e8dd3438fafc220
+("Make zfs-share service resilient to stale exports")
+
+Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Closes #15369
+Closes #15468
+(cherry picked from commit 41e55b476bcfc90f1ad81c02c5375367fdace9e9)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ lib/libshare/os/linux/nfs.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
+index 004946b0c..3dce81840 100644
+--- a/lib/libshare/os/linux/nfs.c
++++ b/lib/libshare/os/linux/nfs.c
+@@ -47,6 +47,7 @@
+ 
+ 
+ static boolean_t nfs_available(void);
++static boolean_t exports_available(void);
+ 
+ typedef int (*nfs_shareopt_callback_t)(const char *opt, const char *value,
+     void *cookie);
+@@ -539,6 +540,8 @@ nfs_commit_shares(void)
+ static void
+ nfs_truncate_shares(void)
+ {
++	if (!exports_available())
++		return;
+ 	nfs_reset_shares(ZFS_EXPORTS_LOCK, ZFS_EXPORTS_FILE);
+ }
+ 
+@@ -566,3 +569,18 @@ nfs_available(void)
+ 
+ 	return (avail == 1);
+ }
++
++static boolean_t
++exports_available(void)
++{
++	static int avail;
++
++	if (!avail) {
++		if (access(ZFS_EXPORTS_DIR, F_OK) != 0)
++			avail = -1;
++		else
++			avail = 1;
++	}
++
++	return (avail == 1);
++}

debian/patches/0011-Allow-FPU-usage-in-user-and-kernel-thread-contexts.patch

@@ -1,327 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 9 Oct 2019 22:36:19 +0000
-Subject: [PATCH] Allow FPU usage in user and kernel thread contexts
-
-Even for dedicated kernel threads we apparently cannot be
-guaranteed that the kernel won't modify the FPU state which
-we saved in the task struck.  Allocate our own per-cpu state
-to preserve the saved register state.  Aside from correctness,
-this allows use of the FPU in user threads again.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-(cherry picked from commit 11170d9073edcbb613f5a4c992293cbb4e3c8e31)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- config/kernel-fpu.m4                         |  7 --
- include/os/linux/kernel/linux/simd.h         |  1 -
- include/os/linux/kernel/linux/simd_aarch64.h |  2 -
- include/os/linux/kernel/linux/simd_x86.h     | 87 +++++++++++++-------
- module/spl/spl-taskq.c                       |  2 -
- module/spl/spl-thread.c                      |  2 -
- module/zcommon/zfs_prop.c                    | 18 ++++
- 7 files changed, 73 insertions(+), 46 deletions(-)
-
-diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4
-index 9ed9b14ad..15bea3c22 100644
---- a/config/kernel-fpu.m4
-+++ b/config/kernel-fpu.m4
-@@ -67,12 +67,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
- 		#error Unsupported architecture
- 		#endif
- 
--		#include <linux/sched.h>
--
--		#if !defined(PF_KTHREAD)
--		#error PF_KTHREAD not defined
--		#endif
--
- 		#ifdef HAVE_KERNEL_FPU_API_HEADER
- 		#include <asm/fpu/api.h>
- 		#include <asm/fpu/internal.h>
-@@ -94,7 +88,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
- 		struct fregs_state *fr __attribute__ ((unused)) = &st->fsave;
- 		struct fxregs_state *fxr __attribute__ ((unused)) = &st->fxsave;
- 		struct xregs_state *xr __attribute__ ((unused)) = &st->xsave;
--		fpu->last_cpu = -1;
- 	])
- ])
- 
-diff --git a/include/os/linux/kernel/linux/simd.h b/include/os/linux/kernel/linux/simd.h
-index 1f6574a90..5138a908b 100644
---- a/include/os/linux/kernel/linux/simd.h
-+++ b/include/os/linux/kernel/linux/simd.h
-@@ -33,7 +33,6 @@
- #else
- 
- #define	kfpu_allowed()		0
--#define	kfpu_initialize(tsk)	do {} while (0)
- #define	kfpu_begin()		do {} while (0)
- #define	kfpu_end()		do {} while (0)
- 
-diff --git a/include/os/linux/kernel/linux/simd_aarch64.h b/include/os/linux/kernel/linux/simd_aarch64.h
-index ac530d920..f6cf3c377 100644
---- a/include/os/linux/kernel/linux/simd_aarch64.h
-+++ b/include/os/linux/kernel/linux/simd_aarch64.h
-@@ -27,7 +27,6 @@
-  *
-  * Kernel fpu methods:
-  *	kfpu_allowed()
-- *	kfpu_initialize()
-  *	kfpu_begin()
-  *	kfpu_end()
-  */
-@@ -43,7 +42,6 @@
- #include <asm/neon.h>
- 
- #define	kfpu_allowed()		1
--#define	kfpu_initialize(tsk)	do {} while (0)
- #define	kfpu_begin()		kernel_neon_begin()
- #define	kfpu_end()		kernel_neon_end()
- 
-diff --git a/include/os/linux/kernel/linux/simd_x86.h b/include/os/linux/kernel/linux/simd_x86.h
-index 486e31845..c42ea918e 100644
---- a/include/os/linux/kernel/linux/simd_x86.h
-+++ b/include/os/linux/kernel/linux/simd_x86.h
-@@ -27,7 +27,6 @@
-  *
-  * Kernel fpu methods:
-  *	kfpu_allowed()
-- *	kfpu_initialize()
-  *	kfpu_begin()
-  *	kfpu_end()
-  *
-@@ -99,7 +98,6 @@
- #if defined(KERNEL_EXPORTS_X86_FPU)
- 
- #define	kfpu_allowed()		1
--#define	kfpu_initialize(tsk)	do {} while (0)
- 
- #if defined(HAVE_UNDERSCORE_KERNEL_FPU)
- #define	kfpu_begin()		\
-@@ -129,16 +127,52 @@
- 
- /*
-  * When the kernel_fpu_* symbols are unavailable then provide our own
-- * versions which allow the FPU to be safely used in kernel threads.
-- * In practice, this is not a significant restriction for ZFS since the
-- * vast majority of SIMD operations are performed by the IO pipeline.
-+ * versions which allow the FPU to be safely used.
-  */
- #if defined(HAVE_KERNEL_FPU_INTERNAL)
- 
-+extern struct fpu **zfs_kfpu_fpregs;
-+
- /*
-- * FPU usage only allowed in dedicated kernel threads.
-+ * Initialize per-cpu variables to store FPU state.
-  */
--#define	kfpu_allowed()		(current->flags & PF_KTHREAD)
-+static inline void
-+kfpu_fini(void)
-+{
-+	int cpu;
-+
-+	for_each_possible_cpu(cpu) {
-+		if (zfs_kfpu_fpregs[cpu] != NULL) {
-+			kfree(zfs_kfpu_fpregs[cpu]);
-+		}
-+	}
-+
-+	kfree(zfs_kfpu_fpregs);
-+}
-+
-+static inline int
-+kfpu_init(void)
-+{
-+	int cpu;
-+
-+	zfs_kfpu_fpregs = kzalloc(num_possible_cpus() *
-+	    sizeof (struct fpu *), GFP_KERNEL);
-+	if (zfs_kfpu_fpregs == NULL)
-+		return (ENOMEM);
-+
-+	for_each_possible_cpu(cpu) {
-+		zfs_kfpu_fpregs[cpu] = kmalloc_node(sizeof (struct fpu),
-+		    GFP_KERNEL, cpu_to_node(cpu));
-+		if (zfs_kfpu_fpregs[cpu] == NULL) {
-+			kfpu_fini();
-+			return (ENOMEM);
-+		}
-+	}
-+
-+	return (0);
-+}
-+
-+#define	kfpu_allowed()		1
- #define	ex_handler_fprestore	ex_handler_default
- 
- /*
-@@ -154,15 +188,6 @@
- #define	kfpu_fxsr_clean(rval)	__asm("fnclex; emms; fildl %P[addr]" \
- 				    : : [addr] "m" (rval));
- 
--static inline void
--kfpu_initialize(void)
--{
--	WARN_ON_ONCE(!(current->flags & PF_KTHREAD));
--
--	/* Invalidate the task's FPU state */
--	current->thread.fpu.last_cpu = -1;
--}
--
- static inline void
- kfpu_save_xsave(struct xregs_state *addr, uint64_t mask)
- {
-@@ -193,8 +218,6 @@ kfpu_save_fsave(struct fregs_state *addr)
- static inline void
- kfpu_begin(void)
- {
--	WARN_ON_ONCE(!kfpu_allowed());
--
- 	/*
- 	 * Preemption and interrupts must be disabled for the critical
- 	 * region where the FPU state is being modified.
-@@ -204,20 +227,18 @@ kfpu_begin(void)
- 
- 	/*
- 	 * The current FPU registers need to be preserved by kfpu_begin()
--	 * and restored by kfpu_end().  This is always required because we
--	 * can not call __cpu_invalidate_fpregs_state() to invalidate the
--	 * per-cpu FPU state and force them to be restored.  Furthermore,
--	 * this implementation relies on the space provided in the task
--	 * structure to store the user FPU state.  As such, it can only
--	 * be used with dedicated kernels which by definition will never
--	 * store user FPU state.
-+	 * and restored by kfpu_end().  They are stored in a dedicated
-+	 * per-cpu variable, not in the task struct, this allows any user
-+	 * FPU state to be correctly preserved and restored.
- 	 */
-+	struct fpu *fpu = zfs_kfpu_fpregs[smp_processor_id()];
-+
- 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
--		kfpu_save_xsave(&current->thread.fpu.state.xsave, ~0);
-+		kfpu_save_xsave(&fpu->state.xsave, ~0);
- 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
--		kfpu_save_fxsr(&current->thread.fpu.state.fxsave);
-+		kfpu_save_fxsr(&fpu->state.fxsave);
- 	} else {
--		kfpu_save_fsave(&current->thread.fpu.state.fsave);
-+		kfpu_save_fsave(&fpu->state.fsave);
- 	}
- }
- 
-@@ -258,12 +279,14 @@ kfpu_restore_fsave(struct fregs_state *addr)
- static inline void
- kfpu_end(void)
- {
-+	struct fpu *fpu = zfs_kfpu_fpregs[smp_processor_id()];
-+
- 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
--		kfpu_restore_xsave(&current->thread.fpu.state.xsave, ~0);
-+		kfpu_restore_xsave(&fpu->state.xsave, ~0);
- 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
--		kfpu_restore_fxsr(&current->thread.fpu.state.fxsave);
-+		kfpu_restore_fxsr(&fpu->state.fxsave);
- 	} else {
--		kfpu_restore_fsave(&current->thread.fpu.state.fsave);
-+		kfpu_restore_fsave(&fpu->state.fsave);
- 	}
- 
- 	local_irq_enable();
-@@ -276,7 +299,6 @@ kfpu_end(void)
-  * FPU support is unavailable.
-  */
- #define	kfpu_allowed()		0
--#define	kfpu_initialize(tsk)	do {} while (0)
- #define	kfpu_begin()		do {} while (0)
- #define	kfpu_end()		do {} while (0)
- 
-@@ -286,6 +308,7 @@ kfpu_end(void)
- /*
-  * Linux kernel provides an interface for CPU feature testing.
-  */
-+
- /*
-  * Detect register set support
-  */
-diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c
-index 90e1d0a4d..a39f94e4c 100644
---- a/module/spl/spl-taskq.c
-+++ b/module/spl/spl-taskq.c
-@@ -28,7 +28,6 @@
- #include <sys/taskq.h>
- #include <sys/kmem.h>
- #include <sys/tsd.h>
--#include <sys/simd.h>
- 
- int spl_taskq_thread_bind = 0;
- module_param(spl_taskq_thread_bind, int, 0644);
-@@ -854,7 +853,6 @@ taskq_thread(void *args)
- 	sigfillset(&blocked);
- 	sigprocmask(SIG_BLOCK, &blocked, NULL);
- 	flush_signals(current);
--	kfpu_initialize();
- 
- 	tsd_set(taskq_tsd, tq);
- 	spin_lock_irqsave_nested(&tq->tq_lock, flags, tq->tq_lock_class);
-diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c
-index 29de9252a..0352a31ea 100644
---- a/module/spl/spl-thread.c
-+++ b/module/spl/spl-thread.c
-@@ -27,7 +27,6 @@
- #include <sys/thread.h>
- #include <sys/kmem.h>
- #include <sys/tsd.h>
--#include <sys/simd.h>
- 
- /*
-  * Thread interfaces
-@@ -55,7 +54,6 @@ thread_generic_wrapper(void *arg)
- 	args = tp->tp_args;
- 	set_current_state(tp->tp_state);
- 	set_user_nice((kthread_t *)current, PRIO_TO_NICE(tp->tp_pri));
--	kfpu_initialize();
- 	kmem_free(tp->tp_name, tp->tp_name_size);
- 	kmem_free(tp, sizeof (thread_priv_t));
- 
-diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
-index dab749138..b5fa1c2f4 100644
---- a/module/zcommon/zfs_prop.c
-+++ b/module/zcommon/zfs_prop.c
-@@ -853,10 +853,27 @@ zfs_prop_align_right(zfs_prop_t prop)
- #endif
- 
- #if defined(_KERNEL)
-+
-+#if defined(HAVE_KERNEL_FPU_INTERNAL)
-+#include <linux/simd.h>
-+
-+struct fpu **zfs_kfpu_fpregs;
-+EXPORT_SYMBOL(zfs_kfpu_fpregs);
-+
-+#else
-+#define	kfpu_init()	0
-+#define	kfpu_fini()	((void) 0)
-+#endif /* HAVE_KERNEL_FPU_INTERNAL */
-+
- static int __init
- zcommon_init(void)
- {
-+	int error = kfpu_init();
-+	if (error)
-+		return (-error);
-+
- 	fletcher_4_init();
-+
- 	return (0);
- }
- 
-@@ -864,6 +881,7 @@ static void __exit
- zcommon_fini(void)
- {
- 	fletcher_4_fini();
-+	kfpu_fini();
- }
- 
- module_init(zcommon_init);

debian/patches/0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Sun, 12 Nov 2023 15:52:25 +0100
+Subject: [PATCH] zpool status: tighten bounds for noalloc stat availabillity
+
+When running zfs 2.2.0 userspace utilities with a kernel that still
+has 2.1.13 modules zpool status adds `(non-allocating)` next to the
+disk name of a single-disk pool.
+
+The reason for this seems to be that the patch adding the `vs_pspace` field was
+backported, but the one adding `vs_noalloc` was not.
+
+Itself that is not a problem, but in 2.2 `noalloc` was added before `psspace`,
+so the struct layout between 2.1.13 and 2.2.0 do NOT match anymore...
+
+I.e., the struct looks like the following at the end for ZFS 2.1.x:
+
+```
+typedef struct vdev_stat {
+    hrtime_t        vs_timestamp;           /* time since vdev load */
+    // snip
+    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
+    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
+    uint64_t        vs_pspace;              /* physical capacity */
+} vdev_stat_t;
+```
+
+And like the following on ZFS 2.2.x:
+```
+typedef struct vdev_stat {
+    hrtime_t        vs_timestamp;           /* time since vdev load */
+    // snip
+    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
+    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
+    uint64_t        vs_noalloc;             /* allocations halted?  */
+    uint64_t        vs_pspace;              /* physical capacity */
+} vdev_stat_t;
+```
+
+Resulting in 2.2.x user-space tooling interpreting the `vs_pspace` field from
+the 2.1.x kernel module as `vs_noalloc` field.
+
+For now, work-around that discrepancy by coupling the availability of
+the vs_noalloc field with the one of the vs_pspace one, as when both
+are returned from the module we can be sure that our struct layout
+matches again.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ cmd/zpool/zpool_main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
+index ed0b8d7a1..f3acc49d0 100644
+--- a/cmd/zpool/zpool_main.c
++++ b/cmd/zpool/zpool_main.c
+@@ -2663,7 +2663,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)"));
+-	} else if (VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
++	} else if (VDEV_STAT_VALID(vs_pspace, vsc)
++		       && VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
+ 		(void) printf(gettext("  (non-allocating)"));
+ 	}
+ 

debian/patches/series

@@ -3,9 +3,9 @@
 0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
 0004-import-with-d-dev-disk-by-id-in-scan-service.patch
 0005-Enable-zed-emails.patch
-0006-Linux-5.0-compat-SIMD-compatibility.patch
+0006-dont-symlink-zed-scripts.patch
-0007-Perform-KABI-checks-in-parallel.patch
+0007-Add-systemd-unit-for-importing-specific-pools.patch
-0008-Linux-4.14-4.19-5.0-compat-SIMD-save-restore.patch
+0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
-0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
+0009-arc-stat-summary-guard-access-to-freshly-introduced-.patch
-0010-OpenZFS-restructuring-move-platform-specific-headers.patch
+0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch
-0011-Allow-FPU-usage-in-user-and-kernel-thread-contexts.patch
+0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch

debian/rules

@@ -5,12 +5,12 @@ include /usr/share/dpkg/default.mk
 VERSION := $(DEB_VERSION_UPSTREAM)
 REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
 
-SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep "sphinx-build$$")
+SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep -m 1 "/sphinx-build$$")
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,python3,systemd,sphinxdoc --parallel
+	dh $@ --with autoreconf,python3,sphinxdoc
 
 adapt_meta_file:
 	@# Embed the downstream version in the module.
@@ -28,17 +28,31 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
-	  --libdir=/lib \
+	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
+	  --with-python=python3 \
+	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
 	  --with-config=user
 
+	for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \
+		basename "$$i" | grep _KVERS_ && continue ; \
+		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
+	done
+
 override_dh_auto_test:
+override_dh_auto_test:
+ifeq (amd64,$(DEB_HOST_ARCH))
+	# Upstream provides an ABI guarantee that we validate here
+	-$(MAKE) checkabi
+endif
+
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 
@@ -46,10 +60,6 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-	# Use upstream's bash completion
-	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-		'$(CURDIR)/contrib/bash_completion.d/zfs'
-
 	# Move from bin_dir to /usr/sbin
 	# Remove suffix (.py) as per policy 10.4 - Scripts
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -61,31 +71,20 @@ override_dh_auto_install:
 	@# Zed has dependencies outside of the system root.
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
+	for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \
-		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+		ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \
 		rm $${i}; \
 	done
 
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_python3:
 	dh_python3 -p python3-pyzfs
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
-ifeq ($(BUILD_UDEB), true)
-	dh_makeshlibs -V -plibnvpair1linux
-	dh_makeshlibs -V -plibuutil1linux
-	dh_makeshlibs -V -plibzfs2linux
-	dh_makeshlibs -V -plibzpool2linux
-	dh_makeshlibs -V -pzfsutils-linux
-endif
-
-override_dh_strip:
-	dh_strip --dbg-package=zfs-dbg
 
 override_dh_auto_clean:
 	find . -name .gitignore -delete
@@ -93,10 +92,21 @@ override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 
+override_dh_install:
+	find debian/tmp/lib -name '*.la' -delete
+	dh_install
+
 override_dh_missing:
-	find . -name lib*.la -delete
 	dh_missing --fail-missing
 
+override_dh_installsystemd:
+	# these to lines prevent the restarting of all systemd services, except
+	# zfs-zed - they should not be restarted (importing, mounting, creating
+	# links in /dev, and can cause erros in the log
+	# (upon major.minor change)
+	dh_installsystemd --no-stop-on-upgrade -X zfs-zed.service
+	dh_installsystemd --name zfs-zed
+
 override_dh_installdocs:
 	dh_installdocs
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))

debian/tree/zfsutils-linux/usr/lib/zfs-linux/scrub

@@ -1,9 +1,45 @@
 #!/bin/sh -eu
 
-# Scrub all healthy pools.
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-scrub"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
+	# TODO: use zpool user-defined property when such feature is available.
+	pool="$1"
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
+}
+
+scrub_if_not_scrub_in_progress () {
+	pool="$1"
+	if ! zpool status "${pool}" | grep -q "scrub in progress"; then
+		# Ignore errors and continue with scrubbing other pools.
+		zpool scrub "${pool}" || true
+	fi
+}
+
+# Scrub all healthy pools that are not already scrubbing as per their configs.
 zpool list -H -o health,name 2>&1 | \
-	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
+	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read pool
 do
-	zpool scrub "$pool"
+	# read user-defined config
+	ret=$(get_property "${pool}")
+	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
+		:
+	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
+		scrub_if_not_scrub_in_progress "${pool}"
+	else
+		cat > /dev/stderr <<EOF
+$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
+$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
+EOF
+	fi
 done

debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim

@@ -0,0 +1,69 @@
+#!/bin/sh -u
+
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-trim"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
+	# TODO: use zpool user-defined property when such feature is available.
+	pool="$1"
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null
+}
+
+trim_if_not_already_trimming () {
+	pool="$1"
+	if ! zpool status "${pool}" | grep -q "trimming"; then
+		# This will error on HDD-only pools: doesn't matter
+		zpool trim "${pool}"
+	fi
+}
+
+# Walk up the kernel parent names:
+# this will catch devices from LVM &a.
+get_transp () {
+	dev="$1"
+	while pd="$(lsblk -dnr -o PKNAME "$dev")"; do
+		if [ -z "$pd" ]; then
+			break
+		else
+			dev="/dev/$pd"
+		fi
+	done
+	lsblk -dnr -o TRAN "$dev"
+}
+
+pool_is_nvme_only () {
+	pool="$1"
+	# get a list of devices attached to the specified pool
+	zpool list -vHP "${pool}" | \
+		awk -F'\t' '$2 ~ "^/dev/" {print $2}' | \
+	while read -r dev
+	do
+		[ "$(get_transp "$dev")" = "nvme" ] || return
+	done
+}
+
+# TRIM all healthy pools that are not already trimming as per their configs.
+zpool list -H -o health,name 2>&1 | \
+	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
+while read -r pool
+do
+	# read user-defined config
+	ret=$(get_property "${pool}") || continue
+	case "${ret}" in
+		disable);;
+		enable)	trim_if_not_already_trimming "${pool}" ;;
+		-|auto)	if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
+		*)	cat > /dev/stderr <<EOF
+$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
+$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
+EOF
+	esac
+done

debian/zfs-dracut.install

@@ -0,0 +1,2 @@
+usr/lib/dracut
+usr/share/man/man7/dracut.zfs.7

debian/zfs-initramfs.lintian-overrides

@@ -0,0 +1 @@
+executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*

debian/zfs-initramfs.triggers

@@ -1 +0,0 @@
-activate update-initramfs

debian/zfs-test.lintian-overrides

@@ -1 +1,10 @@
-zfs-test: arch-dependent-file-in-usr-share
+arch-dependent-file-in-usr-share
+command-in-sbin-has-manpage-in-incorrect-section
+arch-dep-package-has-big-usr-share
+manpage-without-executable
+national-encoding *usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua*
+executable-not-elf-or-script *usr/share/zfs/zfs-tests/tests/functional/cli_root/*
+package-contains-documentation-outside-usr-share-doc *usr/share/zfs/zfs-tests/*
+script-not-executable [usr/share/zfs/common.sh]
+script-not-executable [usr/share/zfs/zfs-tests/include/default.cfg]
+script-not-executable [usr/share/zfs/zfs-tests/tests/functional/*]

debian/zfs-zed.lintian-overrides

@@ -0,0 +1,4 @@
+
+script-not-executable
+# https://github.com/zfsonlinux/zfs/issues/8064
+systemd-service-file-refers-to-unusual-wantedby-target

debian/zfs-zed.postinst

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+# enable all default zedlets that are not overridden
+while read -r file ; do
+    etcfile="${etcd}/${file}"
+    [ -e "${etcfile}" ] && continue
+    ln -sfT "${zedd}/${file}" "${etcfile}"
+done < "${zedd}/DEFAULT-ENABLED"
+
+# remove the overrides created in prerm
+find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
+# remove any dangling symlinks to old zedlets
+find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
+
+#DEBHELPER#
+

debian/zfs-zed.postrm

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" = "purge" ] && [ -d "$etcd" ] ; then
+    # remove the overrides created in prerm
+    find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
+    # remove any dangling symlinks to old zedlets
+    find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
+    # clean up any empty directories
+    ( rmdir "$etcd" && rmdir "/etc/zfs" ) || true
+fi
+
+#DEBHELPER#
+

debian/zfs-zed.prerm

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then
+    while read -r file ; do
+        etcfile="${etcd}/${file}"
+        ( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue
+        ln -sT /dev/null "${etcfile}"
+    done < "${zedd}/DEFAULT-ENABLED"
+fi
+
+#DEBHELPER#
+

debian/zfsutils-linux.cron.d

@@ -1,4 +1,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
+# TRIM the first Sunday of every month.
+24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
+
 # Scrub the second Sunday of every month.
-24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
+24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi

debian/zfsutils-linux.install

@@ -5,9 +5,18 @@ etc/zfs/zpool.d/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 lib/systemd/system/zfs-import-scan.service
+lib/systemd/system/zfs-import@.service
 lib/systemd/system/zfs-import.target
+lib/systemd/system/zfs-import.service
+lib/systemd/system/zfs-load-key.service
 lib/systemd/system/zfs-mount.service
+lib/systemd/system/zfs-scrub-monthly@.timer
+lib/systemd/system/zfs-scrub-weekly@.timer
+lib/systemd/system/zfs-scrub@.service
 lib/systemd/system/zfs-share.service
+lib/systemd/system/zfs-trim-monthly@.timer
+lib/systemd/system/zfs-trim-weekly@.timer
+lib/systemd/system/zfs-trim@.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
 lib/systemd/system/zfs.target
@@ -17,27 +26,112 @@ sbin/fsck.zfs
 sbin/mount.zfs
 sbin/zdb
 sbin/zfs
+sbin/zfs_ids_to_path
+sbin/zgenhostid
 sbin/zhack
 sbin/zpool
+sbin/zstream
 sbin/zstreamdump
-usr/bin/zgenhostid
 usr/bin/zvol_wait
+usr/bin/zilstat
 usr/lib/modules-load.d/ lib/
+usr/lib/zfs-linux/zfs_prepare_disk
 usr/lib/zfs-linux/zpool.d/
+usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 usr/share/bash-completion/completions
+usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.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/man7/vdevprops.7
+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/mount.zfs.8
 usr/share/man/man8/vdev_id.8
 usr/share/man/man8/zdb.8
-usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs-allow.8
+usr/share/man/man8/zfs-bookmark.8
+usr/share/man/man8/zfs-change-key.8
+usr/share/man/man8/zfs-clone.8
+usr/share/man/man8/zfs-create.8
+usr/share/man/man8/zfs-destroy.8
+usr/share/man/man8/zfs-diff.8
+usr/share/man/man8/zfs-get.8
+usr/share/man/man8/zfs-groupspace.8
+usr/share/man/man8/zfs-hold.8
+usr/share/man/man8/zfs-inherit.8
+usr/share/man/man8/zfs-list.8
+usr/share/man/man8/zfs-load-key.8
 usr/share/man/man8/zfs-mount-generator.8
+usr/share/man/man8/zfs-mount.8
+usr/share/man/man8/zfs_prepare_disk.8
 usr/share/man/man8/zfs-program.8
+usr/share/man/man8/zfs-project.8
+usr/share/man/man8/zfs-projectspace.8
+usr/share/man/man8/zfs-promote.8
+usr/share/man/man8/zfs-receive.8
+usr/share/man/man8/zfs-recv.8
+usr/share/man/man8/zfs-redact.8
+usr/share/man/man8/zfs-release.8
+usr/share/man/man8/zfs-rename.8
+usr/share/man/man8/zfs-rollback.8
+usr/share/man/man8/zfs-send.8
+usr/share/man/man8/zfs-set.8
+usr/share/man/man8/zfs-share.8
+usr/share/man/man8/zfs-snapshot.8
+usr/share/man/man8/zfs-unallow.8
+usr/share/man/man8/zfs-unload-key.8
+usr/share/man/man8/zfs-unmount.8
+usr/share/man/man8/zfs-unzone.8
+usr/share/man/man8/zfs-upgrade.8
+usr/share/man/man8/zfs-userspace.8
+usr/share/man/man8/zfs-wait.8
+usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs_ids_to_path.8
 usr/share/man/man8/zgenhostid.8
+usr/share/man/man8/zpool-add.8
+usr/share/man/man8/zpool-attach.8
+usr/share/man/man8/zpool-checkpoint.8
+usr/share/man/man8/zpool-clear.8
+usr/share/man/man8/zpool-create.8
+usr/share/man/man8/zpool-destroy.8
+usr/share/man/man8/zpool-detach.8
+usr/share/man/man8/zpool-events.8
+usr/share/man/man8/zpool-export.8
+usr/share/man/man8/zpool-get.8
+usr/share/man/man8/zpool-history.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-iostat.8
+usr/share/man/man8/zpool-labelclear.8
+usr/share/man/man8/zpool-list.8
+usr/share/man/man8/zpool-offline.8
+usr/share/man/man8/zpool-online.8
+usr/share/man/man8/zpool-reguid.8
+usr/share/man/man8/zpool-remove.8
+usr/share/man/man8/zpool-reopen.8
+usr/share/man/man8/zpool-replace.8
+usr/share/man/man8/zpool-resilver.8
+usr/share/man/man8/zpool-scrub.8
+usr/share/man/man8/zpool-set.8
+usr/share/man/man8/zpool-split.8
+usr/share/man/man8/zpool-status.8
+usr/share/man/man8/zpool-sync.8
+usr/share/man/man8/zpool-trim.8
+usr/share/man/man8/zpool-upgrade.8
+usr/share/man/man8/zpool-wait.8
+usr/share/man/man8/zfs-zone.8
 usr/share/man/man8/zpool.8
+usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
+usr/share/zfs/compatibility.d/

debian/zfsutils-linux.links

@@ -0,0 +1,3 @@
+sbin/zfs      bin/zfs
+sbin/zpool    bin/zpool
+usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb

debian/zfsutils-linux.lintian-overrides

@@ -1 +1,13 @@
+spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
+binary-without-manpage *usr/sbin/dbufstat*
+binary-without-manpage *usr/sbin/arc_summary*
+manpage-has-errors-from-man
+appstream-metadata-missing-modalias-provide
+command-in-sbin-has-manpage-in-incorrect-section
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-cache.service*
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-scan.service*
+spelling-error-in-manpage
+package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-volume-wait.service*
+systemd-service-file-missing-documentation-key *lib/systemd/system/zfs-volume-wait.service*
+extra-license-file *usr/share/doc/zfsutils-linux/LICENSE.gz*