* Update to Linux 6.1.42

* Update to zfs 2.1.12

debian/changelog

@@ -1,3 +1,10 @@
+pve-kernel (6.1.42) generic; urgency=medium
+
+  * Update to Linux 6.1.42  
+  * Update to zfs 2.1.12 
+
+ -- jiangcuo <jiangcuo@bingsin.com>  Thu, 27 Jul 2023 15:23:29 +0000
+
 pve-kernel (6.1.24) generic; urgency=medium
 
   * Update to Linux 6.1.24

debian/control

@@ -27,7 +27,7 @@ Build-Depends: asciidoc,
                xmlto,
                zlib1g-dev,
                zstd
-Build-Conflicts: pve-headers-6.1.24-generic,
+Build-Conflicts: pve-headers-6.1.42-generic,
 Vcs-Git: git://github.com/fabianishere/pve-generic-kernel.git
 Vcs-Browser: https://github.com/fabianishere/pve-generic-kernel
 
@@ -46,7 +46,7 @@ Package: pve-headers-6.1-generic
 Architecture: all
 Section: admin
 Priority: optional
-Depends: pve-headers-6.1.24-generic,
+Depends: pve-headers-6.1.42-generic,
 Description: Latest Proxmox Edge Kernel Headers
  This is a metapackage which will install the kernel headers
  for the latest available Proxmox Edge kernel from the 6.1
@@ -57,12 +57,12 @@ Architecture: all
 Section: admin
 Priority: optional
 Depends: pve-firmware,
-         pve-kernel-6.1.24-generic,
+         pve-kernel-6.1.42-generic,
 Description: Latest Proxmox Edge Kernel Image
  This is a metapackage which will install the latest available
  Proxmox Edge kernel from the 6.1 series.
 
-Package: pve-headers-6.1.24-generic
+Package: pve-headers-6.1.42-generic
 Section: devel
 Priority: optional
 Architecture: any
@@ -72,7 +72,7 @@ Depends:
 Description: The Proxmox Edge Kernel Headers
  This package contains the Proxmox Edge Linux kernel headers
 
-Package: pve-kernel-6.1.24-generic
+Package: pve-kernel-6.1.42-generic
 Section: admin
 Priority: optional
 Architecture: any

debian/patches/series.zfs

@@ -4,8 +4,7 @@ zfs/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
 zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
 zfs/0005-Enable-zed-emails.patch
 zfs/0006-dont-symlink-zed-scripts.patch
-zfs/0007-Use-installed-python3.patch
+zfs/0007-Add-systemd-unit-for-importing-specific-pools.patch
-zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch
+zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
-zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+zfs/0009-arcstat-Fix-integer-division-with-python3.patch
-zfs/0010-arcstat-Fix-integer-division-with-python3.patch
+zfs/0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
-zfs/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch

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

@@ -11,6 +11,7 @@ Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  cmd/zed/zed.d/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

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

@@ -11,6 +11,7 @@ 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>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  etc/systemd/system/50-zfs.preset.in       |  1 +
  etc/systemd/system/Makefile.am            |  1 +

debian/patches/zfs/0007-Use-installed-python3.patch

@@ -1,55 +0,0 @@
-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 370f5382e..661fbe85d 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
- # OpenZFS 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
- 

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

@@ -7,6 +7,7 @@ Originally-By: Mo Zhou <cdluminate@gmail.com>
 Originally-By: Antonio Russo <aerusso@aerusso.net>
 
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  man/Makefile.am                        | 2 +-
  man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-

debian/patches/zfs/0009-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 425e52d1f..010f69ec0 100755
+index 0128fd817..d2b2e28d1 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
 @@ -441,73 +441,73 @@ def calculate():

debian/patches/zfs/0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch

@@ -20,16 +20,17 @@ also move l2_mfu_asize  l2_mru_asize l2_prefetch_asize
 l2_bufc_data_asize l2_bufc_metadata_asize to .get accessor
 (these are only present with a cache device in the pool)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  cmd/arc_summary/arc_summary3 | 28 ++++++++++++++--------------
  cmd/arcstat/arcstat.in       | 14 +++++++-------
  2 files changed, 21 insertions(+), 21 deletions(-)
 
 diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
-index 301c485b3..ac46f5843 100755
+index 9d0c2d30d..fd2581ae2 100755
 --- a/cmd/arc_summary/arc_summary3
 +++ b/cmd/arc_summary/arc_summary3
-@@ -617,13 +617,13 @@ def section_arc(kstats_dict):
+@@ -609,13 +609,13 @@ def section_arc(kstats_dict):
      prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
      prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
      prt_i2('L2 eligible MFU evictions:',
@@ -47,7 +48,7 @@ index 301c485b3..ac46f5843 100755
      prt_i1('L2 ineligible evictions:',
             f_bytes(arc_stats['evict_l2_ineligible']))
      print()
-@@ -765,20 +765,20 @@ def section_l2arc(kstats_dict):
+@@ -757,20 +757,20 @@ def section_l2arc(kstats_dict):
             f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
             f_bytes(arc_stats['l2_hdr_size']))
      prt_i2('MFU allocated size:',
@@ -79,7 +80,7 @@ index 301c485b3..ac46f5843 100755
      print()
      prt_1('L2ARC breakdown:', f_hits(l2_access_total))
 diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
-index 010f69ec0..50e5a7150 100755
+index d2b2e28d1..8004940b3 100755
 --- a/cmd/arcstat/arcstat.in
 +++ b/cmd/arcstat/arcstat.in
 @@ -482,8 +482,8 @@ def calculate():

linux

@@ -1 +1 @@
-Subproject commit 0102425ac76bd184704c698cab7cb4fe37997556
+Subproject commit d2a6dc4eaf6d50ba32a9b39b4c6ec713a92072ab

zfs

@@ -1 +1 @@
-Subproject commit 92e0d9d183ce6752cd52f7277c8321d81df9ffee
+Subproject commit 86783d7d92cf7a859464719a917fdff845b9a9e1