buildsys: fix DEBS variable name

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> (cherry picked from commit b577f030c4) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
bump version to 2.0.7-pve1
2022-01-12 19:39:12 +01:00 · 2022-01-12 18:48:41 +01:00 · 2022-01-12 18:46:00 +01:00 · 2022-01-12 18:46:00 +01:00 · 2021-09-28 09:19:31 +02:00 · 2021-09-28 09:18:24 +02:00
64 changed files with 1034 additions and 14255 deletions
@@ -6,23 +6,33 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2= 					\
+
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+ZFS_DEB_BINARY =				\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libpam-zfs_${ZFSPKGVER}_amd64.deb		\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
-zfsutils-linux_${ZFSPKGVER}_amd64.deb
+zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
-ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+zfs-zed_${ZFSPKGVER}_amd64.deb
 ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
 ZFS_DEB2= ${ZFS_DEB_BINARY}			\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
 python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
 pyzfs-doc_${ZFSPKGVER}_all.deb			\
 spl_${ZFSPKGVER}_all.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb
 DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
 ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 all: deb
 .PHONY: deb
-deb: ${ZFS_DEBS}
+deb: ${DEBS}
 .PHONY: dsc
 dsc: ${ZFS_DSC}
@@ -30,7 +40,7 @@ dsc: ${ZFS_DSC}
 .PHONY: kernel
 kernel: dsc
 	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
+	${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 .PHONY: dinstall
 dinstall: ${DEBS}
@@ -38,22 +48,22 @@ dinstall: ${DEBS}
 .PHONY: submodule
 submodule:
-	test -f "$(ZFSSRC)/README.md" || git submodule update --init
+	test -f "${ZFSSRC}/README.md" || git submodule update --init
-$(ZFSSRC)/README.md: submodule
+${ZFSSRC}/README.md: submodule
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs: ${DEBS}
-$(ZFS_DEB2): $(ZFS_DEB1)
+${ZFS_DEB2}: ${ZFS_DEB1}
-$(ZFS_DEB1): ${ZFSDIR}
+${ZFS_DEB1}: ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+	lintian ${DEBS}
 ${ZFS_DSC}: ${ZFSDIR}
 	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
 	lintian $@
-${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
+${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
 	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
 	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
 	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
@@ -69,4 +79,4 @@ distclean: clean
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64
@@ -1,3 +1,87 @@
 zfs-linux (2.0.7-pve1) buster; urgency=medium
  * update ZFS to 2.0.7
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:46:26 +0100
 zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
  * update ZFS to 2.0.6
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:19:18 +0200
 zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
  * Rebuild for buster based releases
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:01:07 +0200
 zfs-linux (2.0.5-pve1) bullseye; urgency=medium
  * 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
@@ -1 +0,0 @@
 10
@@ -2,9 +2,12 @@ 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,
               libblkid-dev,
               libelf-dev,
               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtool,
               lsb-release,
@@ -14,28 +17,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 +65,57 @@ 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}),
         libzpool4linux (= ${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.
+ libzpool4 and libzfs4.
-Package: libzfs2linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
-Replaces: libzfs2
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Description: OpenZFS filesystem 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.
 .
 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: libzpool4linux
 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.
@@ -143,9 +173,9 @@ 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.
@@ -161,9 +191,9 @@ Suggests: nfs-kernel-server,
 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.
@@ -175,9 +205,14 @@ Depends: zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
 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 +220,7 @@ Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
         attr,
         bc,
         fio,
         ksh,
@@ -198,37 +234,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
@@ -247,3 +265,17 @@ Description: Solaris Porting Layer user-space utilities for Linux (dummy)
 to Linux primitives.
 .
 This is a transitional dummy package. It can safely be removed.
 Package: zfs-dbg
 Section: contrib/metapackages
 Architecture: all
 Suggests: libnvpair3linux-dbgsym,
         libpam-zfs-dbgsym,
         libuutil3linux-dbgsym,
         libzfs4linux-dbgsym,
         libzfsbootenv1linux-dbgsym,
         libzpool4linux-dbgsym,
         zfs-test-dbgsym,
         zfsutils-linux-dbgsym,
         zfs-zed-dbgsym,
 Description: Transitional package. It can be safely removed.
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Native ZFS for Linux
+Upstream-Name: OpenZFS on Linux and FreeBSD
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
-Source: https://github.com/zfsonlinux/zfs/
+Source: https://github.com/openzfs/zfs
 Disclaimer:
 This work was produced at the Lawrence Livermore National Laboratory
 (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
@@ -27,7 +27,9 @@ Disclaimer:
 License: CDDL-1.0
 Files: *
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
  2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
  2013-2014, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 Files: cmd/*
@@ -58,44 +60,50 @@ Copyright: 2011, Lawrence Livermore National Security, LLC
           2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: cmd/raidz_test/*
 Copyright: 2016 Gvozden Nešković.
 License: CDDL-1.0
 Files: cmd/vdev_id/*
 Copyright: 2011, 2013, Nexenta Systems, Inc.
           2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: cmd/zdb/*
-Copyright: 2015, Intel Corporation
+Copyright:
  2011, 2014, Delphix.
  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2011, 2018 by Delphix.
-
+  2014 Integros [integros.com]
-Files: cmd/zdb/zdb_il.c
+  2016 Nexenta Systems, Inc.
-Copyright: 2013, 2014, Delphix.
+  2017, 2018 Lawrence Livermore National Security, LLC.
  2015, 2017, Intel Corporation.
  2017 Spectra Logic Corp Inc.
  2012, Cyril Plisko.
  2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: cmd/zed/*
-Copyright: 2013-2014, Lawrence Livermore National Security, LLC
+Copyright:
  2004, 2010, Oracle and/or its affiliates.
  2004 Sun Microsystems, Inc.
  2016, Intel Corporation.
  2018, loli10K <ezomori.nozomu@gmail.com>
  2017 Open-E, Inc.
  2013-2014, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
-Files: cmd/zfs/zfs_iter.c
+Files: cmd/zfs/*
-Copyright: 2013, Nexenta Systems, Inc.
+Copyright:
  2013, Delphix.
  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
  2005, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2009 Sun Microsystems, Inc.
-
+  2011, 2013, 2014, Delphix.
 Files: cmd/zfs/zfs_main.c
 Copyright: 2013, Steven Hartland.
  2013, Nexenta Systems, Inc.
  2012, Joyent, Inc.
-  2011, 2014, Delphix.
+  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2005, 2010, Oracle and/or its affiliates.
+  2013, Nexenta Systems, Inc.
-License: CDDL-1.0
+  2013, Steven Hartland.
-
+  2012 Milan Jurik.
-Files: cmd/zfs/zfs_util.h
+  2016 Igor Kozhukhov <ikozhukhov@gmail.com>
-Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
+  2018 Datto Inc.
 License: CDDL-1.0
 Files: cmd/zhack/*
@@ -106,50 +114,40 @@ License: CDDL-1.0
 Files: cmd/zinject/*
 Copyright: 2011-2015, Delphix.
           2000, 2005-2010, Oracle and/or its affiliates.
           2017, Intel Corporation.
 License: CDDL-1.0
 Files: cmd/zinject/zinject.h
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: cmd/zpios/*
 Copyright: 2008-2010, Lawrence Livermore National Security, LLC
  2004, Cluster File Systems, Inc
 License: GPL-2+
 Files: cmd/zpool/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
+Copyright:
-License: CDDL-1.0
+ 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-
+ 2005-2010, Sun Microsystems, Inc.
-Files: cmd/zpool/zpool_main.c
+ 2011 Nexenta Systems, Inc. All rights reserved.
-Copyright: 2013, Prasad Joshi (sTec).
+ 2011, 2018 by Delphix. All rights reserved.
-  2012, Frederik Wessels.
+ 2012 by Cyril Plisko. All rights reserved.
-  2012, Cyril Plisko.
+ 2012 by Frederik Wessels. All rights reserved.
-  2011, Nexenta Systems, Inc.
+ 2013 by Prasad Joshi (sTec). All rights reserved.
-  2011, 2014, Delphix.
+ 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
-  2005, 2010, Oracle and/or its affiliates.
+ 2017 Datto Inc.
-License: CDDL-1.0
+ 2017 Open-E, Inc. All Rights Reserved.
-
+ 2017, Intel Corporation.
 Files: cmd/zpool/zpool_util.h
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: cmd/zpool/zpool_vdev.c
 Copyright: 2011-2015, Delphix.
  2000, 2005-2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: cmd/zstreamdump/*
-Copyright: 2013, Delphix.
+Copyright:
  2013, Delphix.
  2012, Martin Matuska <martin@matuska.org>
  2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: cmd/ztest/*
-Copyright: 2013, Steven Hartland.
+Copyright:
  2011, Nexenta Systems, Inc.
  2011, 2015, Delphix.
  2005, 2010, Oracle and/or its affiliates.
  2011, 2018 by Delphix.
  2011 Nexenta Systems, Inc.
  2013 Steven Hartland.
  2014 Integros [integros.com]
  2017 Joyent, Inc.
  2017, Intel Corporation.
 License: CDDL-1.0
 Files: cmd/zvol_id/*
@@ -181,10 +179,18 @@ License: PERMISSIVE2
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
-Files: contrib/*
+Files: contrib/bash_completion.d/*
 Copyright: 2010, 2013, Aneurin Price <aneurin.price@gmail.com>
 License: Expat
 Files: contrib/pam_zfs_key/*
 Copyright: Copyright (c) 2020, Felix Dörre. All rights reserved.
 License: BSD-3-clause
 Files: contrib/pyzfs/*
 Copyright: 2015 ClusterHQ
 License: Apache-2.0
 Files: debian/*
 Copyright:
 2013-2016, Aron Xu <aron@debian.org>
@@ -193,6 +199,9 @@ Copyright:
 2013, Turbo Fredriksson <turbo@bayour.com>
 2012-2013, Richard Laager <rlaager@wiktel.com>
 2011-2013, Darik Horn <dajhorn@vanadac.com>
 2018-2019, Mo Zhou <cdluminate@gmail.com>
 2018-2020, Mo Zhou <lumin@debian.org>
 2015-2021 Proxmox Server Solutions GmbH <support@proxmox.com>
 License: GPL-2+
 Files: debian/po/*
@@ -211,233 +220,41 @@ Copyright:
  2011, Darik Horn.
 License: BSD-2-clause
 Files: etc/systemd/system-generators/*
 Copyright: 2017 Antonio Russo <antonio.e.russo@gmail.com>
 License: Expat
 Files: include/*
-Copyright: 2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
-License: CDDL-1.0
+  2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
-
+  2007 The Regents of the University of California.
-Files: include/libuutil_common.h
+  2008 Sun Microsystems, Inc.
-  include/zfs_fletcher.h
+  2009, 2010, Jorn Amundsen <jorn.amundsen@ntnu.no>
-  include/zfs_prop.h
+  2011 Nexenta Systems, Inc.
-Copyright: 2005-2010, Sun Microsystems, Inc.
+  2011, 2018 by Delphix.
-License: CDDL-1.0
+  2011-2018 Lawrence Livermore National Security, LLC.
-
+  2013 by Saso Kiselkov.
-Files: include/libuutil_impl.h
+  2013, 2017 Joyent, Inc.
-Copyright: 1990-2010, Sun Microsystems, Inc.
+  2014 HybridCluster.
-License: CDDL-1.0
+  2014 Integros [integros.com]
-
+  2014 Spectra Logic Corporation,
-Files: include/libzfs.h
+  2015 Jörg Thalheim.
-Copyright: 2013, Steven Hartland.
+  2015 by Chunwei Chen.
-  2013, Nexenta Systems, Inc.
+  2016 Actifio, Inc.
-  2013, Delphix.
+  2016 Gvozden Neskovic <neskovic@compeng.uni-frankfurt.de>
-  2012, Joyent, Inc.
+  2016 Romain Dolbeau <romain@dolbeau.org>
-  2005, 2010, Oracle and/or its affiliates.
+  2017 Datto Inc.
-License: CDDL-1.0
+  2017, Intel Corporation.
-
+  2016 RackTop Systems.
-Files: include/libzfs_core.h
+  2016 Toomas Soome <tsoome@me.com>
-Copyright: 2011-2014, Delphix.
+  1983-1989, AT&T
-License: CDDL-1.0
+  1982, 1986, 1988, The Regents of the University of California
 Files: include/libzfs_impl.h
  include/zfs_comutil.h
 Copyright: 2011-2015, Delphix.
  2000, 2005-2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/linux/*
 Copyright: 2008-2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 Files: include/linux/kmap_compat.h
 Copyright: 2015, Chunwei Chen.
 License: CDDL-1.0
 Files: include/linux/vfs_compat.h
 Copyright: 2015, Jörg Thalheim
  2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 Files: include/sys/arc.h
 Copyright: 2013, Saso Kiselkov.
  2011, 2012, 2014, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/arc_impl.h
 Copyright: 2013, Saso Kiselkov.
  2013, Nexenta Systems, Inc.
  2013, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/avl.h
  include/sys/dmu_tx.h
  include/sys/metaslab_impl.h
  include/sys/range_tree.h
  include/sys/rrwlock.h
  include/sys/space_map.h
  include/sys/space_reftree.h
  include/sys/txg.h
  include/sys/txg_impl.h
  include/sys/uberblock.h
  include/sys/zio_impl.h
 Copyright: 2011-2014, Delphix.
  2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/avl_impl.h
  include/sys/nvpair_impl.h
  include/sys/sdt.h
  include/sys/uuid.h
  include/sys/vdev_file.h
 Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/blkptr.h
  include/sys/dsl_bookmark.h
  include/sys/multilist.h
 Copyright: 2013-2014, Delphix.
 License: CDDL-1.0
 Files: include/sys/bpobj.h
  include/sys/dmu_traverse.h
  include/sys/dsl_deleg.h
  include/sys/dsl_pool.h
  include/sys/dsl_prop.h
  include/sys/dsl_scan.h
  include/sys/dsl_synctask.h
  include/sys/metaslab.h
  include/sys/nvpair.h
  include/sys/vdev.h
  include/sys/vdev_impl.h
  include/sys/zap.h
  include/sys/zfs_debug.h
  include/sys/zfs_ioctl.h
  include/sys/zfs_znode.h
 Copyright: 2011-2015, Delphix.
  2000, 2005-2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/bptree.h
  include/sys/zfeature.h
 Copyright: 2011-2014, Delphix.
 License: CDDL-1.0
 Files: include/sys/dbuf.h
 Copyright: 2014, Spectra Logic Corporation
  2013, Saso Kiselkov.
  2012, 2015, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dmu.h
 Copyright: 2014, Spectra Logic Corporation
  2014, HybridCluster.
  2012, Joyent, Inc.
  2011, Nexenta Systems, Inc.
  2011, 2014, Delphix.
  2010, Robert Milkowski
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
-Files: include/sys/dmu_impl.h
+Files: include/sys/lua/*
-Copyright: 2013, Delphix.
+Copyright: 1994-2015 Lua.org, PUC-Rio.
-  2012, Joyent, Inc.
+License: Expat
  2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/dmu_objset.h
 Copyright: 2014, Spectra Logic Corporation
  2013, Saso Kiselkov.
  2012, 2014, Delphix.
  2010, Robert Milkowski
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dmu_send.h
 Copyright: 2013, Joyent, Inc.
  2012, 2014, Delphix.
  2011, Nexenta Systems, Inc.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dmu_zfetch.h
  include/sys/spa_boot.h
  include/sys/u8_textprep.h
  include/sys/unique.h
  include/sys/zfs_dir.h
  include/sys/zfs_fuid.h
  include/sys/zfs_rlock.h
  include/sys/zfs_sa.h
  include/sys/zio_compress.h
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/dnode.h
  include/sys/sa_impl.h
 Copyright: 2014, Spectra Logic Corporation
  2011-2015, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dsl_dataset.h
 Copyright: 2014, Spectra Logic Corporation
  2013, Steven Hartland.
  2013, Joyent, Inc.
  2013, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dsl_destroy.h
 Copyright: 2013, Delphix.
  2012, Joyent, Inc.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dsl_dir.h
 Copyright: 2014, Spectra Logic Corporation
  2014, Joyent, Inc.
  2013, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/dsl_userhold.h
 Copyright: 2013, Steven Hartland.
  2012, 2013, Joyent, Inc.
  2012, 2014, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/fm/fs/*
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/fs/*
 Copyright: 2013, Joyent, Inc.
  2011, Nexenta Systems, Inc.
  2011, 2014, Delphix.
  2010, Robert Milkowski
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/mntent.h
 Copyright: 2008, 2009, Sun Microsystems, Inc.
  1984, 1986-1989, AT&T
 License: CDDL-1.0
 Files: include/sys/spa.h
 Copyright: 2014, Spectra Logic Corporation
  2011, Nexenta Systems, Inc.
  2011, 2014, 2015, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/spa_impl.h
 Copyright: 2016, Actifio, Inc.
  2014, Spectra Logic Corporation
  2011, Nexenta Systems, Inc.
  2011, 2015, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/u8_textprep_data.h
 Copyright: 2007, Sun Microsystems, Inc.
@@ -476,316 +293,102 @@ License: Expat~Unicode
 registered in some jurisdictions. All other trademarks and registered
 trademarks mentioned herein are the property of their respective owners.
 Files: include/sys/uio_impl.h
 Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
  1983-1989, AT&T
  1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 Files: include/sys/vdev_disk.h
  include/sys/zpl.h
 Copyright: 2008-2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 Files: include/sys/xvattr.h
 Copyright: 1988, 2010, Oracle and/or its affiliates.
  1983-1989, AT&T
  1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 Files: include/sys/zap_impl.h
  include/sys/zap_leaf.h
 Copyright: 2014, Spectra Logic Corporation
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/zfs_context.h
 Copyright: 2012, Joyent, Inc.
  2012, 2014, Delphix.
  2011, Nexenta Systems, Inc.
  2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/sys/zfs_ctldir.h
 Copyright: 2011, Lawrence Livermore National Security, LLC
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/zil.h
  include/sys/zil_impl.h
 Copyright: 2011-2014, Delphix.
  2010, Robert Milkowski
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/zio.h
 Copyright: 2013, Saso Kiselkov.
  2012, 2014, Delphix.
  2011, Nexenta Systems, Inc.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/sys/zvol.h
 Copyright: 2016, Actifio, Inc.
  2005, 2006, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/zfeature_common.h
 Copyright: 2013, Saso Kiselkov.
  2013, Delphix.
 License: CDDL-1.0
 Files: include/zfs_deleg.h
 Copyright: 2012-2015, Delphix.
  2010, 2011, Nexenta Systems, Inc.
  2005, 2007, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: include/zfs_namecheck.h
 Copyright: 2011-2014, Delphix.
  2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: include/zpios-ctl.h
  include/zpios-internal.h
 Copyright: 2008-2010, Lawrence Livermore National Security, LLC
  2004, Cluster File Systems, Inc
 License: GPL-2+
 Files: lib/*
-Copyright: 2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
+Copyright:
  2000, 2002, 2004, 2005, 2007, 2009, 2010, Oracle and/or its affiliates.
  2011-2018 Lawrence Livermore National Security, LLC.
 License: CDDL-1.0
 Files: lib/libnvpair/*
-Copyright: 2011-2015, Delphix.
+Copyright:
  2014, Joyent, Inc.
  2011-2015, Delphix.
  2000, 2005-2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  1990-2010, Sun Microsystems, Inc.
 Files: lib/libnvpair/nvpair_alloc_system.c
 Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libshare/*
 Copyright: 2011, Gunnar Beutner
  2002, 2010, Oracle and/or its affiliates.
-License: CDDL-1.0
+  2011,2012 Turbo Fredriksson <turbo@bayour.com>
-
+  2012 Cyril Plisko.
 Files: lib/libshare/nfs.c
 Copyright: 2012, Cyril Plisko.
  2011, Gunnar Beutner
  2002, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libshare/smb.c
 Copyright: 2011, 2012, Turbo Fredriksson <turbo@bayour.com>, based on nfs.c
  2002, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libshare/smb.h
 Copyright: 2011, Turbo Fredriksson <turbo@bayour.com>
 License: CDDL-1.0
 Files: lib/libspl/*
-Copyright: 2005-2010, Sun Microsystems, Inc.
+Copyright:
 License: CDDL-1.0
 Files: lib/libspl/asm-generic/*
 Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/getexecname.c
 Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/getmntany.c
 Copyright: 2006, Ricardo Correia.
  2005, Sun Microsystems, Inc.
  1988, AT&T
 License: CDDL-1.0
 Files: lib/libspl/include/*
 Copyright: 1990-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/include/atomic.h
  lib/libspl/include/libshare.h
  lib/libspl/include/statcommon.h
  lib/libspl/include/zone.h
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/include/note.h
 Copyright: 1994, 2008, Sun Microsystems, Inc
 License: CDDL-1.0
 Files: lib/libspl/include/rpc/*
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/include/rpc/xdr.h
 Copyright: 2005, Sun Microsystems, Inc.
  1983-1989, AT&T
 License: CDDL-1.0
 Files: lib/libspl/include/synch.h
 Copyright: 2014, Zettabyte Software, LLC.
  2008, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/include/sys/acl.h
  lib/libspl/include/sys/acl_impl.h
  lib/libspl/include/sys/dkio.h
  lib/libspl/include/sys/isa_defs.h
  lib/libspl/include/sys/kmem.h
  lib/libspl/include/sys/kstat.h
  lib/libspl/include/sys/list.h
  lib/libspl/include/sys/stack.h
  lib/libspl/include/sys/stropts.h
  lib/libspl/include/sys/types32.h
  lib/libspl/include/sys/tzfile.h
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libspl/include/sys/byteorder.h
 Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
  1983-1989, AT&T
  1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 Files: lib/libspl/include/sys/dktp/*
 Copyright: 2008, 2009, Sun Microsystems, Inc.
  1984, 1986-1989, AT&T
-License: CDDL-1.0
+  2005-2010, Sun Microsystems, Inc.
-
+  2006, Ricardo Correia.
-Files: lib/libspl/include/sys/mnttab.h
+  2010, Oracle and/or its affiliates.
-Copyright: 2006, Ricardo Correia
+  2014, Zettabyte Software, LLC.
-  2004, Sun Microsystems, Inc.
+  2017, Lawrence Livermore National Security, LLC.
  1984, 1986-1989, AT&T
 License: CDDL-1.0
 Files: lib/libspl/include/sys/note.h
  lib/libspl/include/sys/sunddi.h
 Copyright: 1994, 2008, Sun Microsystems, Inc
 License: CDDL-1.0
 Files: lib/libspl/include/sys/stat.h
 Copyright: 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libspl/include/sys/uio.h
 Copyright: 2005, Sun Microsystems, Inc.
  1984, 1986-1989, AT&T
  1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 Files: lib/libspl/include/sys/vtoc.h
 Copyright: 2008, 2009, Sun Microsystems, Inc.
  1984, 1986-1989, AT&T
 License: CDDL-1.0
 Files: lib/libspl/mkdirp.c
 Copyright: 2008, 2009, Sun Microsystems, Inc.
  1984, 1986-1989, AT&T
 License: CDDL-1.0
 Files: lib/libspl/strnlen.c
 Copyright: 2008, Sun Microsystems, Inc
 License: CDDL-1.0
 Files: lib/libspl/zone.c
 Copyright: 2006, Ricardo Correia.
 License: CDDL-1.0
 Files: lib/libuutil/*
 Copyright: 1990-2010, Sun Microsystems, Inc.
-License: CDDL-1.0
+           2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 Files: lib/libuutil/uu_alloc.c
  lib/libuutil/uu_misc.c
  lib/libuutil/uu_string.c
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libuutil/uu_avl.c
  lib/libuutil/uu_list.c
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libzfs/*
-Copyright: 2011, 2014, Nexenta Systems, Inc.
+Copyright:
-  2011-2015, Delphix.
+  2005, 2010, Oracle and/or its affiliates.
  2005, 2010, Oracle and/or its affiliates.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_changelist.c
 Copyright: 2010, Sun Microsystems, Inc.
  2007, Ramprakash Jelari
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_config.c
 Copyright: 2011-2014, Delphix.
  2007, 2009, 2010, Sun Microsystems, Inc.
-License: CDDL-1.0
+  2007, Ramprakash Jelari
 Files: lib/libzfs/libzfs_dataset.c
 Copyright: 2013, Steven Hartland.
  2013, Nexenta Systems, Inc.
  2013, Martin Matuska.
  2013, Joyent, Inc.
  2013, Delphix.
  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
  2012, DEY Storage Systems, Inc.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_diff.c
 Copyright: 2015, Nexenta Systems, Inc.
  2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_fru.c
  lib/libzfs/libzfs_graph.c
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_mount.c
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
 Files: lib/libzfs/libzfs_sendrecv.c
 Copyright: 2013, Steven Hartland.
  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
  2012, Joyent, Inc.
  2011, 2014, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
+  2011, 2014, Nexenta Systems, Inc.
-License: CDDL-1.0
+  2011-2015, Delphix.
-
+  2012, DEY Storage Systems, Inc.
-Files: lib/libzfs/libzfs_status.c
+  2012, Joyent, Inc.
-Copyright: 2013, Steven Hartland.
+  2012, Pawel Jakub Dawidek <pawel@dawidek.net>
-  2012, 2014, Delphix.
+  2013, Delphix.
-  2005, 2010, Oracle and/or its affiliates.
+  2013, Joyent, Inc.
-License: CDDL-1.0
+  2013, Martin Matuska.
-
+  2013, Nexenta Systems, Inc.
-Files: lib/libzfs/libzfs_util.c
+  2013, Steven Hartland.
-Copyright: 2013, Joyent, Inc.
+  2015 by Syneto S.R.L.
-  2012, Delphix.
+  2015, OmniTI Computer Consulting, Inc.
-  2005, 2010, Oracle and/or its affiliates.
+  2016 Igor Kozhukhov <ikozhukhov@gmail.com>
  2017-2018 RackTop Systems.
  2017 Open-E, Inc.
  2017, Intel Corporation.
  2018, loli10K <ezomori.nozomu@gmail.com>
  2018 Datto Inc.
 License: CDDL-1.0
 Files: lib/libzfs_core/*
-Copyright: 2013, Steven Hartland.
+Copyright:
-  2011, 2012, 2014, Delphix.
+  2012, 2018 by Delphix.
  2017 Datto Inc.
  2017 RackTop Systems.
  2017 Open-E, Inc.
  2013, Steven Hartland.
 License: CDDL-1.0
-Files: lib/libzpool/taskq.c
+Files: lib/libzpool/*
-Copyright: 2014, Delphix.
+Copyright:
  2014, Delphix.
  2016 Actifio, Inc.
  2014 by Delphix.
  2017 Jason King
  2017, Intel Corporation.
  2012, Garrett DAmore <garrett@damore.org>.
  2011, Nexenta Systems, Inc.
  2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: lib/libzutil/*
 Copyright:
  2015 Nexenta Systems, Inc.
  2005, 2010, Oracle and/or its affiliates.
  2012, 2018 by Delphix.
  2015 RackTop Systems.
  2016, Intel Corporation.
 License: CDDL-1.0
 Files: man/man1/zhack.1
       man/man1/zpios.1
       man/man8/mount.zfs.8
       man/man8/zinject.8
 Copyright: 2013, Darik Horn <dajhorn@vanadac.com>
@@ -833,6 +436,10 @@ Copyright: 2011-2014, Delphix.
  2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: module/lua
 Copyright: 1994-2015 Lua.org, PUC-Rio.
 License: Expat
 Files: module/nvpair/*
 Copyright: 2000, 2002, 2004-2007, 2009, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -882,6 +489,13 @@ Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
  1982, 1986, 1988, The Regents of the University of California
 License: CDDL-1.0
 Files: module/os/linux/spl/*
 Copyright:
  2008-2010 Sun Microsystems, Inc.
  2007-2010 Lawrence Livermore National Security, LLC.
  2007 The Regents of the University of California.
 License: GPL-2+
 Files: module/zfs/*
 Copyright: 2011-2015, Delphix.
  2000, 2005-2010, Oracle and/or its affiliates.
@@ -1088,12 +702,6 @@ Copyright: 2012, 2014, Delphix.
  2008-2010, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
 Files: module/zfs/zfeature_common.c
 Copyright: 2014, Nexenta Systems, Inc.
  2013, Saso Kiselkov.
  2013, Delphix.
 License: CDDL-1.0
 Files: module/zfs/zfs_ctldir.c
 Copyright: 2013, Delphix.
  2011, Lawrence Livermore National Security, LLC
@@ -1163,17 +771,72 @@ Copyright: 2015, Chunwei Chen.
  2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
-Files: module/zpios/*
+Files: module/zstd/zstd-in.c
-Copyright: 2008-2010, Lawrence Livermore National Security, LLC
+Copyright: Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
-  2004, Cluster File Systems, Inc
+  Copyright (c) 2019-2020, Michael Niewöhner
-License: GPL-2+
+License: BSD-3-clause
 Files: module/zstd/zfs_zstd.c
 Copyright: Copyright (c) 2016-2018, Klara Inc.
  Copyright (c) 2016-2018, Allan Jude
  Copyright (c) 2018-2020, Sebastian Gottschall
  Copyright (c) 2019-2020, Michael Niewöhner
  Copyright (c) 2020, The FreeBSD Foundation [1]
 License: BSD-3-clause
 Comment:  [1] Portions of this software were developed by Allan Jude
  under sponsorship from the FreeBSD Foundation.
 Files: scripts/*
 Copyright: 2003-2012, Ville Skyttä <ville.skytta@iki.fi>
           Thorsten Leemhuis <fedora@leemhuis.info>
           Nicolas Chauvet <kwizart@gmail.com>
 License: Expat
 Files: scripts/cstyle.pl
       scripts/make_gitrev.sh
       scripts/zfs-tests.sh
       scripts/zloop.sh
 Copyright: 2005-2010, Sun Microsystems, Inc.
  2018 by Delphix.
  2018 by Matthew Thode.
 License: CDDL-1.0
 Files: tests/*
 Copyright:
  2007 Sun Microsystems, Inc.  All rights reserved.
  2012, 2018 by Delphix. All rights reserved.
  2013 Saso Kiselkov. All rights reserved.
  2013 by Jinshan Xiong. No rights reserved.
  2013, 2018 by Delphix. All rights reserved.
  2014 Nexenta Systems, Inc.
  2015 STRATO AG.
  2015-2018 Lawrence Livermore National Security, LLC.
  2015, OmniTI Computer Consulting, Inc. All rights reserved.
  2016 by Gvozden Neskovic. All rights reserved.
  2016 by Intel, Corp.
  2016 by Jinshan Xiong. No rights reserved.
  2016, loli10K. All rights reserved.
  2017 Datto, Inc.
  2017 Open-E, Inc. All Rights Reserved.
  2017 by Datto Inc. All rights reserved.
  2017 by Fan Yong. All rights reserved.
  2018 Canonical.  All rights reserved.
  2018 George Melikov. All Rights Reserved.
  2018 Joyent, Inc.
  2018 Nutanix Inc.  All rights reserved.
  2018 by Nutanix. All rights reserved.
  2018, Nexenta Systems, Inc.  All rights reserved.
  2018, loli10K <ezomori.nozomu@gmail.com>. All rights reserved.
 License: CDDL-1.0
 Files: tests/zfs-tests/tests/functional/channel_program/lua_core/*.lua
 Copyright:1994-2016 Lua.org, PUC-Rio.
 License: Expat
 Files: tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh
       tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_dryrun_output.ksh
       tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_dryrun_output.ksh
 Copyright: 2020 Attila Fülöp <attila@fueloep.org>
 License: CDDL-1.0
@@ -1577,3 +1240,42 @@ License: BSD-2-clause
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 License: BSD-3-clause
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
     * Neither the name of the <organization> nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 .
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 License: Apache-2.0
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 .
 http://www.apache.org/licenses/LICENSE-2.0
 .
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 .
 On Debian systems, the complete text of the Apache version 2.0 license
 can be found in "/usr/share/common-licenses/Apache-2.0".
@@ -1 +0,0 @@
 lib/libnvpair.so.*
@@ -1 +0,0 @@
 libnvpair1linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 lib/*/security/pam_zfs_key.so
 usr/share/pam-configs/zfs_key
@@ -0,0 +1,6 @@
 #!/bin/sh
 set -e
 pam-auth-update --package
 #DEBHELPER#
@@ -0,0 +1,8 @@
 #!/bin/sh
 set -e
 if [ "$1" = remove ] ; then
    pam-auth-update --package --remove zfs_key
 fi
 #DEBHELPER#
@@ -1 +0,0 @@
 lib/libuutil.so.*
@@ -1 +0,0 @@
 libuutil1linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -1,2 +0,0 @@
 lib/libzfs.so.*
 lib/libzfs_core.so.*
@@ -1 +0,0 @@
 libzfs2linux: package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
 lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1 @@
 lib/libzfsbootenv.so.*
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
@@ -0,0 +1,2 @@
 package-name-doesnt-match-sonames
 extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
@@ -1,4 +0,0 @@
 lib/*.a usr/lib/
 usr/include
 usr/lib/*.so
 usr/share/pkgconfig/*.pc
@@ -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
@@ -1 +0,0 @@
 lib/libzpool.so.*
@@ -1 +0,0 @@
 libzpool2linux: package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -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
@@ -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 b3c1befaa..660d8ccb9 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
@@ -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.
@@ -13,11 +13,11 @@ 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 008075138..570e27707 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)
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
- Documentation=man:zed(8)
+ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 -ExecStart=@sbindir@/zed -F
@@ -14,10 +14,10 @@ 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 f0317e23e..9a5e9cb17 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
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 Type=oneshot
 RemainAfterExit=yes
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
@@ -15,7 +15,7 @@
@@ -0,0 +1,29 @@
 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
 (cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
 [0] https://salsa.debian.org/zfsonlinux-team/zfs.git
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
 ---
 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 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
@@ -48,6 +48,6 @@ install-data-hook:
 	for f in $(zedconfdefaults); do \
 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
 -	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
 	done
 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
@@ -0,0 +1,55 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Antonio Russo <antonio.e.russo@gmail.com>
 Date: Tue, 5 May 2020 22:15:16 -0600
 Subject: [PATCH] Use installed python3
 ---
 .../functional/cli_root/zfs_program/zfs_program_json.ksh    | 6 +++---
 .../tests/functional/rsend/send_encrypted_files.ksh         | 2 +-
 .../tests/functional/rsend/send_realloc_dnode_size.ksh      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 index 3788543b0..c7ee4ae9a 100755
 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
@@ -100,10 +100,10 @@ typeset -a pos_cmds_out=(
 # the same as the input and the --sort-keys option was added.  Detect when
 # --sort-keys is supported and apply the option to ensure the expected order.
 #
 -if python -m json.tool --sort-keys <<< "{}"; then
 -	JSON_TOOL_CMD="python -m json.tool --sort-keys"
 +if python3 -m json.tool --sort-keys <<< "{}"; then
 +	JSON_TOOL_CMD="python3 -m json.tool --sort-keys"
 else
 -	JSON_TOOL_CMD="python -m json.tool"
 +	JSON_TOOL_CMD="python3 -m json.tool"
 fi
 typeset -i cnt=0
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 index d52f0261a..18356b017 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
 # ZoL issue #7432
 log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
 log_must touch /$TESTPOOL/$TESTFS2/attrs
 -log_must eval "python -c 'print \"a\" * 4096' | \
 +log_must eval "python3 -c 'print \"a\" * 4096' | \
 	set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs"
 log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 index 551ed15db..bd30488ea 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
@@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
 # 4. Create an empty file and add xattrs to it to exercise reclaiming a
 #    dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
 log_must zfs set compression=on xattr=sa $POOL/fs
 -log_must eval "python -c 'print \"a\" * 512' |
 +log_must eval "python3 -c 'print \"a\" * 512' |
     set_xattr_stdin bigval /$POOL/fs/attrs"
 log_must zfs snapshot $POOL/fs@d
@@ -0,0 +1,66 @@
 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.
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 etc/systemd/system/50-zfs.preset.in       |  1 +
 etc/systemd/system/Makefile.am            |  1 +
 etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 etc/systemd/system/zfs-import@.service.in
 diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
 index e4056a92c..030611419 100644
 --- a/etc/systemd/system/50-zfs.preset.in
 +++ b/etc/systemd/system/50-zfs.preset.in
@@ -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/Makefile.am b/etc/systemd/system/Makefile.am
 index c374a52ac..25d1b99d7 100644
 --- a/etc/systemd/system/Makefile.am
 +++ b/etc/systemd/system/Makefile.am
@@ -7,6 +7,7 @@ systemdunit_DATA = \
 	zfs-zed.service \
 	zfs-import-cache.service \
 	zfs-import-scan.service \
 +	zfs-import@.service \
 	zfs-mount.service \
 	zfs-share.service \
 	zfs-volume-wait.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..9b4ee9371
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import@.service.in
@@ -0,0 +1,16 @@
 +[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
 +
 +[Service]
 +Type=oneshot
 +RemainAfterExit=yes
 +ExecStart=@sbindir@/zpool import -N -d /dev/disk/by-id -o cachefile=none %I
 +
 +[Install]
 +WantedBy=zfs-import.target
@@ -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) */
 /*
@@ -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>
@@ -0,0 +1,54 @@
 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>
 ---
 man/man1/Makefile.am                   | 2 +-
 man/man8/Makefile.am                   | 1 +
 man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
 diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
 index 8d7457a3e..101af7b6c 100644
 --- a/man/man1/Makefile.am
 +++ b/man/man1/Makefile.am
@@ -1,4 +1,4 @@
 -dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
 +dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
 EXTRA_DIST = cstyle.1
 if BUILD_LINUX
 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
 index 07f6aefa6..a757b1c62 100644
 --- a/man/man8/Makefile.am
 +++ b/man/man8/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/Substfiles.am
 dist_man_MANS = \
 +	arcstat.8 \
 	fsck.zfs.8 \
 	mount.zfs.8 \
 	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 ca508b49c..0aa81849a 100644
 --- a/man/man1/arcstat.1
 +++ b/man/man8/arcstat.8
@@ -13,7 +13,7 @@
 .\" Copyright (c) 2015 by Delphix. All rights reserved.
 .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
 .\"
 -.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
 +.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
 .SH NAME
 arcstat \- report ZFS ARC and L2ARC statistics
 .SH SYNOPSIS
@@ -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);
@@ -3,9 +3,7 @@
 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-Use-installed-python3.patch
-0008-Linux-4.14-4.19-5.0-compat-SIMD-save-restore.patch
+0008-Add-systemd-unit-for-importing-specific-pools.patch
-0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
+0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
 0010-OpenZFS-restructuring-move-platform-specific-headers.patch
 0011-Allow-FPU-usage-in-user-and-kernel-thread-contexts.patch
@@ -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 --parallel
 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.
@@ -61,9 +75,9 @@ 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
@@ -76,16 +90,9 @@ override_dh_python3:
 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
+	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
 override_dh_auto_clean:
 	find . -name .gitignore -delete
@@ -93,10 +100,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)))
@@ -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
@@ -0,0 +1,60 @@
 #!/bin/sh -eu
 # 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 || return 1
 }
 trim_if_not_already_trimming () {
 	pool="$1"
 	if ! zpool status "${pool}" | grep -q "trimming"; then
 		# Ignore errors (i.e. HDD pools),
 		# and continue with trimming other pools.
 		zpool trim "${pool}" || true
 	fi
 }
 zpool_is_nvme_only () {
 	zpool=$1
 	# get a list of devices attached to the specified zpool
 	zpool list -vHPL "${zpool}" |
 		awk -F'\t' '$2 ~ /^\/dev\// {
 			if($2 !~ /^\/dev\/nvme/)
 				exit 1
 		}'
 }
 # 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 pool
 do
 	# read user-defined config
 	ret=$(get_property "${pool}")
 	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
 		:
 	elif [ "enable" = "${ret}" ]; then
 		trim_if_not_already_trimming "${pool}"
 	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
 		if zpool_is_nvme_only "${pool}"; then
 			trim_if_not_already_trimming "${pool}"
 		fi
 	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
@@ -1 +0,0 @@
 activate update-initramfs
@@ -1 +1,13 @@
-zfs-test: arch-dependent-file-in-usr-share
+arch-dependent-file-in-usr-share
 script-not-executable usr/share/zfs/common.sh
 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/zfs_jail/jail.conf
 script-not-executable usr/share/zfs/zfs-tests/include/default.cfg
 script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
 script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
 script-not-executable usr/share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
 script-not-executable usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib
 package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*
@@ -0,0 +1,4 @@
 script-not-executable
 # https://github.com/zfsonlinux/zfs/issues/8064
 systemd-service-file-refers-to-unusual-wantedby-target
@@ -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#
@@ -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#
@@ -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#
@@ -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
@@ -5,7 +5,9 @@ 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-mount.service
 lib/systemd/system/zfs-share.service
 lib/systemd/system/zfs-volume-wait.service
@@ -17,10 +19,12 @@ 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/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
@@ -28,6 +32,7 @@ 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/man5/
@@ -35,9 +40,81 @@ 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-jail.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-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-unjail.8
 usr/share/man/man8/zfs-unload-key.8
 usr/share/man/man8/zfs-unmount.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/zfsconcepts.8
 usr/share/man/man8/zfsprops.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-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/zpool.8
 usr/share/man/man8/zpoolconcepts.8
 usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
@@ -1 +1,14 @@
 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
 package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-load-module.service
		`@@ -1 +0,0 @@`
			`libnvpair1linux: package-name-doesnt-match-sonames`
		`@@ -0,0 +1,2 @@`
							`lib/*/security/pam_zfs_key.so`
							`usr/share/pam-configs/zfs_key`
		`@@ -1 +0,0 @@`
			`libuutil1linux: package-name-doesnt-match-sonames`
		`@@ -1 +0,0 @@`
			`libzfs2linux: package-name-doesnt-match-sonames`
		`@@ -0,0 +1,2 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfs.so.*`
							`lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*`
		`@@ -0,0 +1 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*`
		`@@ -0,0 +1,2 @@`
							`package-name-doesnt-match-sonames`
							`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`
		`@@ -1 +0,0 @@`
			`libzpool2linux: package-name-doesnt-match-sonames`