update zfs submodule to 2.1.6 and refresh patches

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/debian/patches/0010-arcstat-Fix-integer-division-with-python3.patch b/debian/patches/0010-arcstat-Fix-integer-division-with-python3.patch
index 086347f8bd55b3613e3a60b6892ad3ac29368fe7..33633e5debaa11dc28643a8a789f2373229144aa 100644 (file)
--- a/debian/patches/0010-arcstat-Fix-integer-division-with-python3.patch
+++ b/debian/patches/0010-arcstat-Fix-integer-division-with-python3.patch
@@ -22,7 +22,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 33 insertions(+), 33 deletions(-)
 
 diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
-index 9e7c52a6c..cd9a803a2 100755
+index 425e52d1f..010f69ec0 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
 @@ -441,73 +441,73 @@ def calculate():

diff --git a/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch b/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
index 6a70484825d6f4bfe366dd3069e4648d26cd830f..0747a1e0e03f6a4be5bb48b9f6789758bc031cdf 100644 (file)
--- a/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
+++ b/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
@@ -79,7 +79,7 @@ index 7b28012ed..fe6a6d9e2 100755
      print()
      prt_1('L2ARC breakdown:', f_hits(l2_access_total))
 diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
-index cd9a803a2..ea45dc602 100755
+index 010f69ec0..50e5a7150 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
 @@ -482,8 +482,8 @@ def calculate():

diff --git a/upstream b/upstream
index 6c3c5fcfbe27d9193cd131753cc7e47ee2784621..6a6bd493988c75331deab06e5352a9bed035a87d 160000 (submodule)
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 6c3c5fcfbe27d9193cd131753cc7e47ee2784621
+Subproject commit 6a6bd493988c75331deab06e5352a9bed035a87d