diff --git a/.gitmodules b/.gitmodules index d50c64e..681c991 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,5 @@ url = https://github.com/openzfs/zfs.git [submodule "linux"] path = linux - url = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git + url = https://git.proxmox.com/git/mirror_ubuntu-kernels.git + diff --git a/debian/changelog b/debian/changelog index d3116da..602b183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pve-kernel (5.15.107) generic; urgency=medium + + * Update to Linux 5.15.107 + * Update to ZFS 2.1.11 + * Switch kernel to ubuntu + + -- Jiangcuo Sat, 4 Apr 2023 22:49:28 +0800 + pve-kernel (5.15.104) generic; urgency=medium * Update to Linux 5.15.104 diff --git a/debian/config/config.pve b/debian/config/config.pve index a605880..388fe6f 100644 --- a/debian/config/config.pve +++ b/debian/config/config.pve @@ -2413,7 +2413,7 @@ CONFIG_IMX_SCU=y CONFIG_IMX_SCU_PD=y CONFIG_MESON_SM=y CONFIG_ARM_PSCI_FW=y -CONFIG_ARM_PSCI_CHECKER=y +# CONFIG_ARM_PSCI_CHECKER is not set CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y CONFIG_ARM_SMCCC_SOC_ID=y diff --git a/debian/control b/debian/control deleted file mode 100644 index 4d1f7e5..0000000 --- a/debian/control +++ /dev/null @@ -1,98 +0,0 @@ -Source: pve-kernel -Section: devel -Priority: optional -Maintainer: Jiang Cuo -Build-Depends: asciidoc, - automake, - bc, - bison, - cpio, - debhelper (>= 10~), - dwarves (>= 1.16), - flex, - gcc (>= 8.3.0-6), - git, - kmod, - libdw-dev, - libelf-dev, - libiberty-dev, - libnuma-dev, - libslang2-dev, - libssl-dev, - lz4, - python3-minimal, - python3-dev, - quilt, - rsync, - xmlto, - zlib1g-dev, - zstd -Build-Conflicts: pve-headers-5.15.104-generic, -Vcs-Git: git://github.com/jiangcuo/pve-arm64-kernel -Vcs-Browser: https://github.com/jiangcuo/pve-arm64-kernel - -Package: linux-tools-5.15 -Architecture: arm64 -Section: devel -Priority: optional -Depends: linux-base, - ${misc:Depends}, - ${shlibs:Depends}, -Description: Linux kernel version specific tools for version 5.15 - This package provides the architecture dependent parts for kernel - version locked tools (such as perf and x86_energy_perf_policy) - -Package: pve-headers-5.15-generic -Architecture: any -Section: admin -Priority: optional -Depends: pve-headers-5.15.104-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 5.15 - series. - -Package: pve-kernel-5.15-generic -Architecture: arm64 -Section: admin -Priority: optional -Depends: pve-firmware, - pve-kernel-5.15.104-generic, -Description: Latest Proxmox Edge Kernel Image - This is a metapackage which will install the latest available - Proxmox Edge kernel from the 5.15 series. - -Package: pve-headers-5.15.104-generic -Section: devel -Priority: optional -Architecture: arm64 -Provides: linux-headers, - linux-headers-2.6, -Depends: -Description: The Proxmox Edge Kernel Headers - This package contains the Proxmox Edge Linux kernel headers - -Package: pve-kernel-5.15.104-generic -Section: admin -Priority: optional -Architecture: arm64 -Provides: linux-image, - linux-image-2.6, -Suggests: pve-firmware, -Depends: busybox, - initramfs-tools, -Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64, -Description: The Proxmox PVE Kernel Image - This package contains the Linux kernel and initial ramdisk used for booting - -Package: pve-kernel-libc-dev -Section: devel -Priority: optional -Architecture: arm64 -Provides: linux-libc-dev, -Conflicts: linux-libc-dev, -Replaces: linux-libc-dev, -Depends: ${misc:Depends} -Description: Linux support headers for userspace development - This package provides userspaces headers from the Linux kernel. These headers - are used by the installed headers for GNU libc and other system libraries. diff --git a/debian/patches/pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch b/debian/patches/pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch new file mode 100644 index 0000000..afe3c07 --- /dev/null +++ b/debian/patches/pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Tue, 12 May 2015 19:29:22 +0100 +Subject: [PATCH] Make mkcompile_h accept an alternate timestamp string +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We want to include the Debian version in the utsname::version string +instead of a full timestamp string. However, we still need to provide +a standard timestamp string for gen_initramfs_list.sh to make the +kernel image reproducible. + +Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to +$KBUILD_BUILD_TIMESTAMP. + +Signed-off-by: Fabian Grünbichler +Signed-off-by: Thomas Lamprecht +--- + init/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init/Makefile b/init/Makefile +index 26de459006c4..3157d9c79901 100644 +--- a/init/Makefile ++++ b/init/Makefile +@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC) := PREEMPT_DYNAMIC + preempt-flag-$(CONFIG_PREEMPT_RT) := PREEMPT_RT + + build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto)) +-build-timestamp = $(or $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto)) ++build-timestamp = $(or $(KBUILD_BUILD_VERSION_TIMESTAMP), $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto)) + + # Maximum length of UTS_VERSION is 64 chars + filechk_uts_version = \ diff --git a/debian/patches/pve/0002-wireless-Add-Debian-wireless-regdb-certificates.patch b/debian/patches/pve/0002-wireless-Add-Debian-wireless-regdb-certificates.patch new file mode 100644 index 0000000..4c0ac0f --- /dev/null +++ b/debian/patches/pve/0002-wireless-Add-Debian-wireless-regdb-certificates.patch @@ -0,0 +1,1451 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Fri, 13 Apr 2018 20:10:28 +0100 +Subject: [PATCH] wireless: Add Debian wireless-regdb certificates + +This hex dump is generated using: + +{ + for cert in debian/certs/wireless-regdb-*.pem; do + openssl x509 -in $cert -outform der; + done +} | hexdump -v -e '1/1 "0x%.2x," "\n"' > net/wireless/certs/debian.hex + +Signed-off-by: Thomas Lamprecht +--- + net/wireless/certs/debian.hex | 1426 +++++++++++++++++++++++++++++++++ + 1 file changed, 1426 insertions(+) + create mode 100644 net/wireless/certs/debian.hex + +diff --git a/net/wireless/certs/debian.hex b/net/wireless/certs/debian.hex +new file mode 100644 +index 000000000000..c5ab03f8c500 +--- /dev/null ++++ b/net/wireless/certs/debian.hex +@@ -0,0 +1,1426 @@ ++0x30, ++0x82, ++0x02, ++0xbd, ++0x30, ++0x82, ++0x01, ++0xa5, ++0x02, ++0x14, ++0x57, ++0x7e, ++0x02, ++0x1c, ++0xb9, ++0x80, ++0xe0, ++0xe8, ++0x20, ++0x82, ++0x1b, ++0xa7, ++0xb5, ++0x4b, ++0x49, ++0x61, ++0xb8, ++0xb4, ++0xfa, ++0xdf, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x0b, ++0x05, ++0x00, ++0x30, ++0x1a, ++0x31, ++0x18, ++0x30, ++0x16, ++0x06, ++0x03, ++0x55, ++0x04, ++0x03, ++0x0c, ++0x0f, ++0x62, ++0x65, ++0x6e, ++0x68, ++0x40, ++0x64, ++0x65, ++0x62, ++0x69, ++0x61, ++0x6e, ++0x2e, ++0x6f, ++0x72, ++0x67, ++0x30, ++0x20, ++0x17, ++0x0d, ++0x32, ++0x30, ++0x30, ++0x31, ++0x33, ++0x30, ++0x31, ++0x33, ++0x32, ++0x36, ++0x31, ++0x33, ++0x5a, ++0x18, ++0x0f, ++0x32, ++0x31, ++0x32, ++0x30, ++0x30, ++0x31, ++0x30, ++0x36, ++0x31, ++0x33, ++0x32, ++0x36, ++0x31, ++0x33, ++0x5a, ++0x30, ++0x1a, ++0x31, ++0x18, ++0x30, ++0x16, ++0x06, ++0x03, ++0x55, ++0x04, ++0x03, ++0x0c, ++0x0f, ++0x62, ++0x65, ++0x6e, ++0x68, ++0x40, ++0x64, ++0x65, ++0x62, ++0x69, ++0x61, ++0x6e, ++0x2e, ++0x6f, ++0x72, ++0x67, ++0x30, ++0x82, ++0x01, ++0x22, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x01, ++0x05, ++0x00, ++0x03, ++0x82, ++0x01, ++0x0f, ++0x00, ++0x30, ++0x82, ++0x01, ++0x0a, ++0x02, ++0x82, ++0x01, ++0x01, ++0x00, ++0x9d, ++0xe1, ++0x77, ++0xa0, ++0x24, ++0xa0, ++0xd5, ++0x79, ++0x65, ++0x3a, ++0x07, ++0x90, ++0xc9, ++0xf6, ++0xa5, ++0xa6, ++0x1f, ++0x84, ++0x1c, ++0x23, ++0x07, ++0x4b, ++0x4f, ++0xa5, ++0x03, ++0xc6, ++0x0f, ++0xf7, ++0x54, ++0xd5, ++0x8b, ++0x7e, ++0x79, ++0x81, ++0x00, ++0xd2, ++0xe9, ++0x3d, ++0xf4, ++0x97, ++0xfe, ++0x84, ++0xcd, ++0x55, ++0xbd, ++0xc9, ++0x8f, ++0x21, ++0x57, ++0x88, ++0x06, ++0x39, ++0x90, ++0x66, ++0x41, ++0x26, ++0x79, ++0x2c, ++0xca, ++0x3f, ++0x95, ++0x87, ++0x01, ++0x11, ++0x2f, ++0x2f, ++0xb0, ++0xe1, ++0x0b, ++0x43, ++0xfc, ++0x5f, ++0x2f, ++0x4f, ++0x67, ++0x04, ++0xdb, ++0x4d, ++0xb7, ++0x72, ++0x4d, ++0xd1, ++0xc5, ++0x76, ++0x73, ++0x4d, ++0x91, ++0x69, ++0xb0, ++0x71, ++0x17, ++0x36, ++0xea, ++0xab, ++0x0a, ++0x3a, ++0xcd, ++0x95, ++0x9b, ++0x76, ++0x1b, ++0x8e, ++0x21, ++0x17, ++0x8f, ++0xc5, ++0x02, ++0xbf, ++0x24, ++0xc7, ++0xc0, ++0x40, ++0xb1, ++0x3b, ++0xc4, ++0x80, ++0x7c, ++0x71, ++0xa5, ++0x51, ++0xdc, ++0xf7, ++0x3a, ++0x58, ++0x7f, ++0xb1, ++0x07, ++0x81, ++0x8a, ++0x10, ++0xd1, ++0xf6, ++0x93, ++0x17, ++0x71, ++0xe0, ++0xfa, ++0x51, ++0x79, ++0x15, ++0xd4, ++0xd7, ++0x8f, ++0xad, ++0xbd, ++0x6f, ++0x38, ++0xe1, ++0x26, ++0x7d, ++0xbc, ++0xf0, ++0x3e, ++0x80, ++0x89, ++0xb4, ++0xec, ++0x8e, ++0x69, ++0x90, ++0xdb, ++0x97, ++0x8a, ++0xf0, ++0x23, ++0x23, ++0x83, ++0x82, ++0x3b, ++0x6a, ++0xb1, ++0xac, ++0xeb, ++0xe7, ++0x99, ++0x74, ++0x2a, ++0x35, ++0x8e, ++0xa9, ++0x64, ++0xfd, ++0x46, ++0x9e, ++0xe8, ++0xe5, ++0x48, ++0x61, ++0x31, ++0x6e, ++0xe6, ++0xfc, ++0x19, ++0x18, ++0x54, ++0xc3, ++0x1b, ++0x4f, ++0xd6, ++0x00, ++0x44, ++0x87, ++0x1c, ++0x37, ++0x45, ++0xea, ++0xf5, ++0xc9, ++0xcb, ++0x0f, ++0x0c, ++0x55, ++0xec, ++0xcf, ++0x6a, ++0xc2, ++0x45, ++0x26, ++0x23, ++0xa2, ++0x31, ++0x52, ++0x4d, ++0xee, ++0x21, ++0x7d, ++0xfd, ++0x58, ++0x72, ++0xc2, ++0x28, ++0xc5, ++0x8e, ++0xa9, ++0xd0, ++0xee, ++0x01, ++0x77, ++0x08, ++0xa5, ++0xf0, ++0x22, ++0x2b, ++0x47, ++0x79, ++0x2b, ++0xcf, ++0x9a, ++0x46, ++0xb5, ++0x8f, ++0xfd, ++0x64, ++0xa2, ++0xb5, ++0xed, ++0x02, ++0x03, ++0x01, ++0x00, ++0x01, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x0b, ++0x05, ++0x00, ++0x03, ++0x82, ++0x01, ++0x01, ++0x00, ++0x20, ++0x44, ++0xfe, ++0xa9, ++0x9e, ++0xdd, ++0x9b, ++0xea, ++0xce, ++0x25, ++0x75, ++0x08, ++0xf0, ++0x2b, ++0x53, ++0xf7, ++0x5a, ++0x36, ++0x1c, ++0x4a, ++0x23, ++0x7f, ++0xd0, ++0x41, ++0x3c, ++0x12, ++0x2b, ++0xb9, ++0x80, ++0x4e, ++0x8a, ++0x15, ++0x5d, ++0x1f, ++0x40, ++0xa7, ++0x26, ++0x28, ++0x32, ++0xc3, ++0x5b, ++0x06, ++0x28, ++0x2d, ++0x3d, ++0x08, ++0x09, ++0x1e, ++0x01, ++0xe9, ++0x67, ++0xe3, ++0x33, ++0xe6, ++0x15, ++0x45, ++0x39, ++0xee, ++0x17, ++0x83, ++0xdb, ++0x42, ++0xff, ++0x7f, ++0x35, ++0xf4, ++0xac, ++0x16, ++0xdb, ++0xba, ++0xb8, ++0x1a, ++0x20, ++0x21, ++0x41, ++0xff, ++0xf3, ++0x92, ++0xff, ++0x65, ++0x6e, ++0x29, ++0x16, ++0xd0, ++0xbf, ++0x8d, ++0xdf, ++0x48, ++0x2c, ++0x73, ++0x36, ++0x7f, ++0x22, ++0xe6, ++0xee, ++0x78, ++0xb4, ++0x63, ++0x83, ++0x0e, ++0x39, ++0xeb, ++0xaf, ++0x10, ++0x2a, ++0x90, ++0xd3, ++0xfc, ++0xe6, ++0xc3, ++0x8f, ++0x97, ++0x5b, ++0x76, ++0xbf, ++0x9b, ++0xf5, ++0x98, ++0xd2, ++0x53, ++0x06, ++0x8b, ++0xf8, ++0xa4, ++0x04, ++0x9b, ++0x1b, ++0x62, ++0x6a, ++0x9d, ++0xac, ++0xe6, ++0x4b, ++0x0d, ++0xc9, ++0xd7, ++0x56, ++0x63, ++0x15, ++0x01, ++0x38, ++0x8c, ++0xbe, ++0xf1, ++0x44, ++0xc4, ++0x38, ++0x27, ++0xe0, ++0xcf, ++0x72, ++0xd6, ++0x3d, ++0xe4, ++0xf7, ++0x4b, ++0x3b, ++0xd2, ++0xb1, ++0x0c, ++0xd5, ++0x83, ++0x6d, ++0x1e, ++0x10, ++0x04, ++0x69, ++0x29, ++0x88, ++0x69, ++0xe0, ++0x7d, ++0xd7, ++0xdb, ++0xb4, ++0x59, ++0x72, ++0x8d, ++0x9d, ++0x3c, ++0x43, ++0xaf, ++0xc6, ++0x7d, ++0xb7, ++0x21, ++0x15, ++0x52, ++0x8a, ++0xe9, ++0x9b, ++0x6b, ++0x2e, ++0xe8, ++0x27, ++0x3c, ++0x3f, ++0x2d, ++0x84, ++0xfb, ++0x9a, ++0x22, ++0x0a, ++0x9f, ++0x6a, ++0x25, ++0xe6, ++0x39, ++0xe4, ++0x74, ++0x73, ++0xb6, ++0x2a, ++0x70, ++0xaa, ++0x1d, ++0xcb, ++0xcc, ++0xd4, ++0xa0, ++0x1b, ++0x26, ++0x71, ++0x63, ++0x04, ++0xc5, ++0x12, ++0x21, ++0x48, ++0xba, ++0x92, ++0x27, ++0x06, ++0xa8, ++0x3e, ++0x6d, ++0xa1, ++0x43, ++0xa5, ++0xd2, ++0x2a, ++0xf7, ++0xca, ++0xc4, ++0x26, ++0xe8, ++0x5b, ++0x1f, ++0xe4, ++0xdc, ++0x89, ++0xdc, ++0x1f, ++0x04, ++0x79, ++0x3f, ++0x30, ++0x82, ++0x02, ++0xcd, ++0x30, ++0x82, ++0x01, ++0xb5, ++0x02, ++0x14, ++0x3a, ++0xbb, ++0xc6, ++0xec, ++0x14, ++0x6e, ++0x09, ++0xd1, ++0xb6, ++0x01, ++0x6a, ++0xb9, ++0xd6, ++0xcf, ++0x71, ++0xdd, ++0x23, ++0x3f, ++0x03, ++0x28, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x0b, ++0x05, ++0x00, ++0x30, ++0x22, ++0x31, ++0x20, ++0x30, ++0x1e, ++0x06, ++0x03, ++0x55, ++0x04, ++0x03, ++0x0c, ++0x17, ++0x72, ++0x6f, ++0x6d, ++0x61, ++0x69, ++0x6e, ++0x2e, ++0x70, ++0x65, ++0x72, ++0x69, ++0x65, ++0x72, ++0x40, ++0x67, ++0x6d, ++0x61, ++0x69, ++0x6c, ++0x2e, ++0x63, ++0x6f, ++0x6d, ++0x30, ++0x20, ++0x17, ++0x0d, ++0x32, ++0x30, ++0x30, ++0x32, ++0x32, ++0x34, ++0x31, ++0x39, ++0x30, ++0x31, ++0x34, ++0x34, ++0x5a, ++0x18, ++0x0f, ++0x32, ++0x31, ++0x32, ++0x30, ++0x30, ++0x31, ++0x33, ++0x31, ++0x31, ++0x39, ++0x30, ++0x31, ++0x34, ++0x34, ++0x5a, ++0x30, ++0x22, ++0x31, ++0x20, ++0x30, ++0x1e, ++0x06, ++0x03, ++0x55, ++0x04, ++0x03, ++0x0c, ++0x17, ++0x72, ++0x6f, ++0x6d, ++0x61, ++0x69, ++0x6e, ++0x2e, ++0x70, ++0x65, ++0x72, ++0x69, ++0x65, ++0x72, ++0x40, ++0x67, ++0x6d, ++0x61, ++0x69, ++0x6c, ++0x2e, ++0x63, ++0x6f, ++0x6d, ++0x30, ++0x82, ++0x01, ++0x22, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x01, ++0x05, ++0x00, ++0x03, ++0x82, ++0x01, ++0x0f, ++0x00, ++0x30, ++0x82, ++0x01, ++0x0a, ++0x02, ++0x82, ++0x01, ++0x01, ++0x00, ++0xf0, ++0xb8, ++0x4f, ++0x3f, ++0x70, ++0x78, ++0xf8, ++0x74, ++0x45, ++0xa2, ++0x28, ++0xaf, ++0x04, ++0x75, ++0x04, ++0xa3, ++0xf3, ++0xa7, ++0xc7, ++0x04, ++0xac, ++0xb6, ++0xe1, ++0xfc, ++0xe1, ++0xc0, ++0x3d, ++0xe0, ++0x26, ++0x90, ++0x8a, ++0x45, ++0x60, ++0xc4, ++0x75, ++0xf3, ++0x1a, ++0x33, ++0x37, ++0x56, ++0x7d, ++0x30, ++0x07, ++0x75, ++0x0e, ++0xa6, ++0x79, ++0x06, ++0x95, ++0x9d, ++0x17, ++0x3c, ++0x09, ++0xa9, ++0x7f, ++0xab, ++0x95, ++0x5d, ++0xed, ++0xe0, ++0x75, ++0x26, ++0x2f, ++0x65, ++0x65, ++0xcd, ++0x61, ++0xb1, ++0x33, ++0x27, ++0x67, ++0x41, ++0xa1, ++0x01, ++0x13, ++0xe9, ++0x13, ++0x6a, ++0x6d, ++0x4e, ++0x98, ++0xe1, ++0x9e, ++0x7b, ++0x0b, ++0x5b, ++0x44, ++0xef, ++0x68, ++0x5a, ++0x6f, ++0x7d, ++0x97, ++0xa1, ++0x33, ++0x22, ++0x97, ++0x12, ++0x21, ++0x09, ++0x8f, ++0x90, ++0xe0, ++0x25, ++0x94, ++0xdd, ++0x8a, ++0x3a, ++0xf7, ++0x4a, ++0x60, ++0x04, ++0x26, ++0x6d, ++0x00, ++0x82, ++0xe4, ++0xcf, ++0x64, ++0x1c, ++0x79, ++0x15, ++0x24, ++0xf2, ++0x42, ++0x86, ++0xf5, ++0x10, ++0x86, ++0xac, ++0x20, ++0x88, ++0x90, ++0x87, ++0xdf, ++0x8c, ++0x37, ++0x7c, ++0xbf, ++0x35, ++0xd5, ++0x6f, ++0x9f, ++0x77, ++0xc3, ++0xcd, ++0x69, ++0x25, ++0x06, ++0xc2, ++0x65, ++0x51, ++0x71, ++0x89, ++0x7f, ++0x6e, ++0x4d, ++0xe5, ++0xd5, ++0x8a, ++0x36, ++0x1a, ++0xad, ++0xc1, ++0x18, ++0xd6, ++0x14, ++0x42, ++0x87, ++0xf0, ++0x93, ++0x83, ++0xf1, ++0x99, ++0x74, ++0xc4, ++0x13, ++0xaa, ++0x3b, ++0x66, ++0x85, ++0x6f, ++0xe0, ++0xbc, ++0x5f, ++0xb6, ++0x40, ++0xa6, ++0x41, ++0x06, ++0x0a, ++0xba, ++0x0e, ++0xe9, ++0x32, ++0x44, ++0x10, ++0x39, ++0x53, ++0xcd, ++0xbf, ++0xf3, ++0xd3, ++0x26, ++0xf6, ++0xb6, ++0x2b, ++0x40, ++0x2e, ++0xb9, ++0x88, ++0xc1, ++0xf4, ++0xe3, ++0xa0, ++0x28, ++0x77, ++0x4f, ++0xba, ++0xa8, ++0xca, ++0x9c, ++0x05, ++0xba, ++0x88, ++0x96, ++0x99, ++0x54, ++0x89, ++0xa2, ++0x8d, ++0xf3, ++0x73, ++0xa1, ++0x8c, ++0x4a, ++0xa8, ++0x71, ++0xee, ++0x2e, ++0xd2, ++0x83, ++0x14, ++0x48, ++0xbd, ++0x98, ++0xc6, ++0xce, ++0xdc, ++0xa8, ++0xa3, ++0x97, ++0x2e, ++0x40, ++0x16, ++0x2f, ++0x02, ++0x03, ++0x01, ++0x00, ++0x01, ++0x30, ++0x0d, ++0x06, ++0x09, ++0x2a, ++0x86, ++0x48, ++0x86, ++0xf7, ++0x0d, ++0x01, ++0x01, ++0x0b, ++0x05, ++0x00, ++0x03, ++0x82, ++0x01, ++0x01, ++0x00, ++0x76, ++0x5d, ++0x03, ++0x3d, ++0xb6, ++0x96, ++0x00, ++0x1b, ++0x6e, ++0x0c, ++0xdd, ++0xbb, ++0xc8, ++0xdf, ++0xbc, ++0xeb, ++0x6c, ++0x01, ++0x40, ++0x1a, ++0x2b, ++0x07, ++0x60, ++0xa1, ++0x1a, ++0xe1, ++0x43, ++0x57, ++0xfa, ++0xbe, ++0xde, ++0xbb, ++0x8f, ++0x73, ++0xf3, ++0x92, ++0xa2, ++0xaa, ++0x83, ++0x01, ++0xc1, ++0x17, ++0xe4, ++0x9d, ++0x09, ++0x41, ++0xe0, ++0x32, ++0x33, ++0x97, ++0x4b, ++0xf2, ++0xdc, ++0x0f, ++0x8b, ++0xa8, ++0xb8, ++0x5a, ++0x04, ++0x86, ++0xf6, ++0x71, ++0xa1, ++0x97, ++0xd0, ++0x54, ++0x56, ++0x10, ++0x8e, ++0x54, ++0x99, ++0x0d, ++0x2a, ++0xa9, ++0xaf, ++0x1b, ++0x55, ++0x59, ++0x06, ++0x2b, ++0xa4, ++0x5f, ++0xb1, ++0x54, ++0xa6, ++0xec, ++0xc7, ++0xd6, ++0x43, ++0xee, ++0x86, ++0x2c, ++0x9b, ++0x18, ++0x9d, ++0x8f, ++0x00, ++0x82, ++0xc1, ++0x88, ++0x61, ++0x16, ++0x85, ++0x3c, ++0x17, ++0x56, ++0xfe, ++0x6a, ++0xa0, ++0x7a, ++0x68, ++0xc5, ++0x7b, ++0x3d, ++0x3c, ++0xb6, ++0x13, ++0x18, ++0x99, ++0x6d, ++0x74, ++0x65, ++0x13, ++0x67, ++0xb7, ++0xfc, ++0x5a, ++0x44, ++0x48, ++0x72, ++0xa0, ++0x73, ++0xb8, ++0xff, ++0x02, ++0x9d, ++0x7c, ++0x5b, ++0xf9, ++0x7c, ++0x75, ++0x0a, ++0x3c, ++0x81, ++0x80, ++0x3c, ++0x41, ++0xf2, ++0xd5, ++0xfa, ++0x3d, ++0x1f, ++0xe3, ++0xda, ++0x8c, ++0xa5, ++0x17, ++0x1f, ++0x53, ++0x1a, ++0x75, ++0xad, ++0x4e, ++0x11, ++0x1c, ++0x07, ++0xec, ++0x0a, ++0x69, ++0xfd, ++0x33, ++0xfa, ++0x32, ++0x7e, ++0x66, ++0xf5, ++0x29, ++0xe8, ++0x4d, ++0x8a, ++0xfa, ++0x0d, ++0x4b, ++0x68, ++0xc3, ++0x95, ++0x11, ++0xba, ++0x6f, ++0x1e, ++0x07, ++0x8c, ++0x85, ++0xc7, ++0xc7, ++0xc9, ++0xc1, ++0x30, ++0xa3, ++0x70, ++0xb0, ++0xa1, ++0xe0, ++0xd5, ++0x85, ++0x15, ++0x94, ++0x77, ++0xc1, ++0x1c, ++0x91, ++0xf1, ++0x5f, ++0x50, ++0xcd, ++0x2c, ++0x57, ++0x4b, ++0x22, ++0x4f, ++0xee, ++0x95, ++0xd7, ++0xa7, ++0xa4, ++0x59, ++0x62, ++0xae, ++0xb9, ++0xbf, ++0xd7, ++0x63, ++0x5a, ++0x04, ++0xfc, ++0x24, ++0x11, ++0xae, ++0x34, ++0x4b, ++0xf4, ++0x0c, ++0x9f, ++0x0b, ++0x59, ++0x7d, ++0x27, ++0x39, ++0x54, ++0x69, ++0x4f, ++0xfd, ++0x6e, ++0x44, ++0x9f, ++0x21, diff --git a/debian/patches/pve/0002-bridge-keep-MAC-of-first-assigned-port.patch b/debian/patches/pve/0003-bridge-keep-MAC-of-first-assigned-port.patch similarity index 100% rename from debian/patches/pve/0002-bridge-keep-MAC-of-first-assigned-port.patch rename to debian/patches/pve/0003-bridge-keep-MAC-of-first-assigned-port.patch diff --git a/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch new file mode 100644 index 0000000..87cd3f1 --- /dev/null +++ b/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -0,0 +1,196 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Weiman +Date: Wed, 7 Feb 2018 16:04:03 -0500 +Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.15) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This an updated version of Alex Williamson's patch from: +https://lkml.org/lkml/2013/5/30/513 + +Original commit message follows: +PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that +allows us to control whether transactions are allowed to be redirected +in various subnodes of a PCIe topology. For instance, if two +endpoints are below a root port or downsteam switch port, the +downstream port may optionally redirect transactions between the +devices, bypassing upstream devices. The same can happen internally +on multifunction devices. The transaction may never be visible to the +upstream devices. + +One upstream device that we particularly care about is the IOMMU. If +a redirection occurs in the topology below the IOMMU, then the IOMMU +cannot provide isolation between devices. This is why the PCIe spec +encourages topologies to include ACS support. Without it, we have to +assume peer-to-peer DMA within a hierarchy can bypass IOMMU isolation. + +Unfortunately, far too many topologies do not support ACS to make this +a steadfast requirement. Even the latest chipsets from Intel are only +sporadically supporting ACS. We have trouble getting interconnect +vendors to include the PCIe spec required PCIe capability, let alone +suggested features. + +Therefore, we need to add some flexibility. The pcie_acs_override= +boot option lets users opt-in specific devices or sets of devices to +assume ACS support. The "downstream" option assumes full ACS support +on root ports and downstream switch ports. The "multifunction" +option assumes the subset of ACS features available on multifunction +endpoints and upstream switch ports are supported. The "id:nnnn:nnnn" +option enables ACS support on devices matching the provided vendor +and device IDs, allowing more strategic ACS overrides. These options +may be combined in any order. A maximum of 16 id specific overrides +are available. It's suggested to use the most limited set of options +necessary to avoid completely disabling ACS across the topology. +Note to hardware vendors, we have facilities to permanently quirk +specific devices which enforce isolation but not provide an ACS +capability. Please contact me to have your devices added and save +your customers the hassle of this boot option. + +Signed-off-by: Fabian Grünbichler +Signed-off-by: Thomas Lamprecht +--- + .../admin-guide/kernel-parameters.txt | 9 ++ + drivers/pci/quirks.c | 102 ++++++++++++++++++ + 2 files changed, 111 insertions(+) + +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index 2e77ecc12692..eae6fdc4c683 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt ++++ b/Documentation/admin-guide/kernel-parameters.txt +@@ -4188,6 +4188,15 @@ + Also, it enforces the PCI Local Bus spec + rule that those bits should be 0 in system reset + events (useful for kexec/kdump cases). ++ pci_acs_override = ++ [PCIE] Override missing PCIe ACS support for: ++ downstream ++ All downstream ports - full ACS capabilities ++ multifunction ++ Add multifunction devices - multifunction ACS subset ++ id:nnnn:nnnn ++ Specific device - full ACS capabilities ++ Specified as vid:did (vendor/device ID) in hex + noioapicquirk [APIC] Disable all boot interrupt quirks. + Safety option to keep boot IRQs enabled. This + should never be necessary. +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 267e6002e29f..fac76ca1d16a 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void) + } + fs_initcall_sync(pci_apply_final_quirks); + ++static bool acs_on_downstream; ++static bool acs_on_multifunction; ++ ++#define NUM_ACS_IDS 16 ++struct acs_on_id { ++ unsigned short vendor; ++ unsigned short device; ++}; ++static struct acs_on_id acs_on_ids[NUM_ACS_IDS]; ++static u8 max_acs_id; ++ ++static __init int pcie_acs_override_setup(char *p) ++{ ++ if (!p) ++ return -EINVAL; ++ ++ while (*p) { ++ if (!strncmp(p, "downstream", 10)) ++ acs_on_downstream = true; ++ if (!strncmp(p, "multifunction", 13)) ++ acs_on_multifunction = true; ++ if (!strncmp(p, "id:", 3)) { ++ char opt[5]; ++ int ret; ++ long val; ++ ++ if (max_acs_id >= NUM_ACS_IDS - 1) { ++ pr_warn("Out of PCIe ACS override slots (%d)\n", ++ NUM_ACS_IDS); ++ goto next; ++ } ++ ++ p += 3; ++ snprintf(opt, 5, "%s", p); ++ ret = kstrtol(opt, 16, &val); ++ if (ret) { ++ pr_warn("PCIe ACS ID parse error %d\n", ret); ++ goto next; ++ } ++ acs_on_ids[max_acs_id].vendor = val; ++ p += strcspn(p, ":"); ++ if (*p != ':') { ++ pr_warn("PCIe ACS invalid ID\n"); ++ goto next; ++ } ++ ++ p++; ++ snprintf(opt, 5, "%s", p); ++ ret = kstrtol(opt, 16, &val); ++ if (ret) { ++ pr_warn("PCIe ACS ID parse error %d\n", ret); ++ goto next; ++ } ++ acs_on_ids[max_acs_id].device = val; ++ max_acs_id++; ++ } ++next: ++ p += strcspn(p, ","); ++ if (*p == ',') ++ p++; ++ } ++ ++ if (acs_on_downstream || acs_on_multifunction || max_acs_id) ++ pr_warn("Warning: PCIe ACS overrides enabled; This may allow non-IOMMU protected peer-to-peer DMA\n"); ++ ++ return 0; ++} ++early_param("pcie_acs_override", pcie_acs_override_setup); ++ ++static int pcie_acs_overrides(struct pci_dev *dev, u16 acs_flags) ++{ ++ int i; ++ ++ /* Never override ACS for legacy devices or devices with ACS caps */ ++ if (!pci_is_pcie(dev) || ++ pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS)) ++ return -ENOTTY; ++ ++ for (i = 0; i < max_acs_id; i++) ++ if (acs_on_ids[i].vendor == dev->vendor && ++ acs_on_ids[i].device == dev->device) ++ return 1; ++ ++ switch (pci_pcie_type(dev)) { ++ case PCI_EXP_TYPE_DOWNSTREAM: ++ case PCI_EXP_TYPE_ROOT_PORT: ++ if (acs_on_downstream) ++ return 1; ++ break; ++ case PCI_EXP_TYPE_ENDPOINT: ++ case PCI_EXP_TYPE_UPSTREAM: ++ case PCI_EXP_TYPE_LEG_END: ++ case PCI_EXP_TYPE_RC_END: ++ if (acs_on_multifunction && dev->multifunction) ++ return 1; ++ } ++ ++ return -ENOTTY; ++} ++ + /* + * Decoding should be disabled for a PCI device during BAR sizing to avoid + * conflict. But doing so may cause problems on host bridge and perhaps other +@@ -4959,6 +5059,8 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs }, + /* APM X-Gene */ + { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, ++ /* Enable overrides for missing ACS capabilities */ ++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, + /* Ampere Computing */ + { PCI_VENDOR_ID_AMPERE, 0xE005, pci_quirk_xgene_acs }, + { PCI_VENDOR_ID_AMPERE, 0xE006, pci_quirk_xgene_acs }, diff --git a/debian/patches/pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/debian/patches/pve/0005-kvm-disable-default-dynamic-halt-polling-growth.patch similarity index 95% rename from debian/patches/pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch rename to debian/patches/pve/0005-kvm-disable-default-dynamic-halt-polling-growth.patch index 93252eb..24f7586 100644 --- a/debian/patches/pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/debian/patches/pve/0005-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index fab4d3790578..adae153354c2 100644 +index 07aae60288f9..949b7204cf52 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/debian/patches/pve/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/debian/patches/pve/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch similarity index 78% rename from debian/patches/pve/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch rename to debian/patches/pve/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index efb3160..fe6f40a 100644 --- a/debian/patches/pve/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/debian/patches/pve/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -3,17 +3,21 @@ From: Thomas Lamprecht Date: Wed, 7 Oct 2020 17:18:28 +0200 Subject: [PATCH] net: core: downgrade unregister_netdevice refcount leak from emergency to error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Lamprecht +Signed-off-by: Fabian Grünbichler --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 3be256051e99..e79b1695a4cb 100644 +index fce980d531bd..5079a3851798 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10273,7 +10273,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) +@@ -10257,7 +10257,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) if (time_after(jiffies, warning_time + READ_ONCE(netdev_unregister_timeout_secs) * HZ)) { list_for_each_entry(dev, list, todo_list) { diff --git a/debian/patches/pve/0007-Revert-fortify-Do-not-cast-to-unsigned-char.patch b/debian/patches/pve/0007-Revert-fortify-Do-not-cast-to-unsigned-char.patch new file mode 100644 index 0000000..192e77e --- /dev/null +++ b/debian/patches/pve/0007-Revert-fortify-Do-not-cast-to-unsigned-char.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas Lamprecht +Date: Tue, 10 Jan 2023 08:52:40 +0100 +Subject: [PATCH] Revert "fortify: Do not cast to "unsigned char"" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 106b7a61c488d2022f44e3531ce33461c7c0685f. + +Signed-off-by: Thomas Lamprecht +Signed-off-by: Fabian Grünbichler +--- + include/linux/fortify-string.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h +index 7cad8bb031e9..acc24887db3e 100644 +--- a/include/linux/fortify-string.h ++++ b/include/linux/fortify-string.h +@@ -18,7 +18,7 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning(" + + #define __compiletime_strlen(p) \ + ({ \ +- char *__p = (char *)(p); \ ++ unsigned char *__p = (unsigned char *)(p); \ + size_t __ret = SIZE_MAX; \ + size_t __p_size = __member_size(p); \ + if (__p_size != SIZE_MAX && \ diff --git a/debian/patches/series.linux b/debian/patches/series.linux index 56340f0..190e29f 100644 --- a/debian/patches/series.linux +++ b/debian/patches/series.linux @@ -1,2 +1,7 @@ -pve/0002-bridge-keep-MAC-of-first-assigned-port.patch -pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch +pve/0002-wireless-Add-Debian-wireless-regdb-certificates.patch +pve/0003-bridge-keep-MAC-of-first-assigned-port.patch +pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +pve/0005-kvm-disable-default-dynamic-halt-polling-growth.patch +pve/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +pve/0007-Revert-fortify-Do-not-cast-to-unsigned-char.patch diff --git a/debian/patches/series.zfs b/debian/patches/series.zfs index 2718484..0904b0f 100644 --- a/debian/patches/series.zfs +++ b/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/0008-Add-systemd-unit-for-importing-specific-pools.patch -zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch -zfs/0010-arcstat-Fix-integer-division-with-python3.patch -zfs/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch +zfs/0007-Add-systemd-unit-for-importing-specific-pools.patch +zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +zfs/0009-arcstat-Fix-integer-division-with-python3.patch +zfs/0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch diff --git a/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch b/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch index 60fe550..33c066b 100644 --- a/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch +++ b/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch @@ -11,6 +11,7 @@ Signed-off-by: Stoiko Ivanov Description: track default symlinks, instead of symlinking Forwarded: no need +Signed-off-by: Thomas Lamprecht --- cmd/zed/zed.d/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/zfs/0007-Add-systemd-unit-for-importing-specific-pools.patch similarity index 97% rename from debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch rename to debian/patches/zfs/0007-Add-systemd-unit-for-importing-specific-pools.patch index e724b2f..3d36180 100644 --- a/debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch +++ b/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 +Signed-off-by: Thomas Lamprecht --- etc/systemd/system/50-zfs.preset.in | 1 + etc/systemd/system/Makefile.am | 1 + diff --git a/debian/patches/zfs/0007-Use-installed-python3.patch b/debian/patches/zfs/0007-Use-installed-python3.patch deleted file mode 100644 index 69e5dd7..0000000 --- a/debian/patches/zfs/0007-Use-installed-python3.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Russo -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 - diff --git a/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch similarity index 95% rename from debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch rename to debian/patches/zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch index 16ab943..03135ed 100644 --- a/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +++ b/debian/patches/zfs/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch @@ -7,6 +7,7 @@ Originally-By: Mo Zhou Originally-By: Antonio Russo Signed-off-by: Stoiko Ivanov +Signed-off-by: Thomas Lamprecht --- man/Makefile.am | 2 +- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +- diff --git a/debian/patches/zfs/0010-arcstat-Fix-integer-division-with-python3.patch b/debian/patches/zfs/0009-arcstat-Fix-integer-division-with-python3.patch similarity index 99% rename from debian/patches/zfs/0010-arcstat-Fix-integer-division-with-python3.patch rename to debian/patches/zfs/0009-arcstat-Fix-integer-division-with-python3.patch index 33633e5..863c02b 100644 --- a/debian/patches/zfs/0010-arcstat-Fix-integer-division-with-python3.patch +++ b/debian/patches/zfs/0009-arcstat-Fix-integer-division-with-python3.patch @@ -22,7 +22,7 @@ Signed-off-by: Thomas Lamprecht 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(): diff --git a/debian/patches/zfs/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch b/debian/patches/zfs/0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch similarity index 96% rename from debian/patches/zfs/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch rename to debian/patches/zfs/0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch index 020186c..61f03b5 100644 --- a/debian/patches/zfs/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch +++ b/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 +Signed-off-by: Thomas Lamprecht --- 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(): diff --git a/linux b/linux index 1154723..39b1ad2 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 115472395b0a9ea522ba0e106d6dfd7a73df8ba6 +Subproject commit 39b1ad2696b8e76f7e33aae243d20117c70b5d50 diff --git a/zfs b/zfs index 92e0d9d..e25f913 160000 --- a/zfs +++ b/zfs @@ -1 +1 @@ -Subproject commit 92e0d9d183ce6752cd52f7277c8321d81df9ffee +Subproject commit e25f9131d679692704c11dc0c1df6d4585b70c35