[pve-devel] [PATCH zfsonlinux] update submodule and patches for zfs-0.8.6

[Stoiko Ivanov]

zfs-0.8.6 got released recently [0]. The changes are rather small:
* compat for kernels up to 5.10
* a fix for ARC performance (certain hits were not accounted,
  resulting in earlier eviction)
* build fixes for in kernel (not module) compilation

None of them seem to have a large potential for regression to me.
I quickly tested it on a test-setup of mine:
* storage replication
* container snapshot+rollback

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 .../0004-import-with-d-dev-disk-by-id-in-scan-service.patch | 4 ++--
 ...0008-Add-systemd-unit-for-importing-specific-pools.patch | 6 +++---
 upstream                                                    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
index 4ad0db30..12dfde85 100644
--- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht at 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 278f937fe..e8c502a33 100644
+index 6520f3246..1718f98a2 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes
diff --git a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
index c5d27816..e8992176 100644
--- a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
+++ b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
@@ -14,8 +14,8 @@ Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
 ---
  etc/systemd/system/50-zfs.preset.in       |  1 +
  etc/systemd/system/Makefile.am            |  2 ++
- etc/systemd/system/zfs-import at .service.in | 17 +++++++++++++++++
- 3 files changed, 20 insertions(+)
+ etc/systemd/system/zfs-import at .service.in | 16 ++++++++++++++++
+ 3 files changed, 19 insertions(+)
  create mode 100644 etc/systemd/system/zfs-import at .service.in
 
 diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
@@ -52,7 +52,7 @@ index 4e14467a0..ae72102af 100644
  	$(top_srcdir)/etc/systemd/system/zfs-import.target.in \
 diff --git a/etc/systemd/system/zfs-import at .service.in b/etc/systemd/system/zfs-import at .service.in
 new file mode 100644
-index 000000000..2db9fdaab
+index 000000000..9b4ee9371
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import at .service.in
 @@ -0,0 +1,16 @@
diff --git a/upstream b/upstream
index d2632f0c..2bc66898 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit d2632f0cc196a685428115ab023bf4fe3d8e5806
+Subproject commit 2bc66898b7056140108a4937a6557d9fe27cafc6
-- 
2.20.1