Add Linux 5.13 (#125)

This pull request adds the necessary changes for the new Linux release
version 5.13.

.github/workflows/watch.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        branch: ['v5.10.x', 'v5.12.x']
+        branch: ['v5.10.x', 'v5.12.x', 'v5.13.x']
     steps:
     - name: Checkout Sources
       uses: actions/checkout@v2

README.md

@@ -2,6 +2,7 @@
 Custom Linux kernels for Proxmox VE 6.
 
 #### Versions
+1. Linux 5.13 (Mainline)
 1. Linux 5.12 (Stable)
 1. Linux 5.11 (Stable) [EOL]
 1. Linux 5.10 (Long-term)

debian/changelog

@@ -1,3 +1,10 @@
+pve-kernel (5.13.0-1) edge; urgency=medium
+
+  * Update to Linux 5.13.
+  * Update to OpenZFS 2.1.0-rc7.
+
+ -- Fabian Mastenbroek <mail.fabianm@gmail.com>  Mon, 28 Jun 2021 17:00:00 +0000
+
 pve-kernel (5.12.0-1) edge; urgency=medium
 
   * Update to Linux 5.12.

debian/patches/pve/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch

@@ -10,13 +10,13 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/core/dev.c b/net/core/dev.c
-index 449b45b843d4..9e247c1a065f 100644
+index ef8cf7619b..787d7dc1c7 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -10258,7 +10258,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
+@@ -10488,7 +10488,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
- 		refcnt = netdev_refcnt_read(dev);
+ 		if (refcnt != 1 &&
- 
+ 		    time_after(jiffies, warning_time +
- 		if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
+ 			       netdev_unregister_timeout_secs * HZ)) {
 -			pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
 +			pr_err("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
  				 dev->name, refcnt);

debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch

@@ -14,15 +14,15 @@ 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 f0317e23e..9a5e9cb17 100644
+index c1111c73a..c5e12c2c6 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
 @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none ${ZPOOL_IMPORT_OPTS}
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none ${ZPOOL_IMPORT_OPTS}
  
  [Install]
  WantedBy=zfs-import.target

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

@@ -8,47 +8,29 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>
 
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
- man/man1/Makefile.am                   | 2 +-
+diff --git a/man/Makefile.am b/man/Makefile.am
- man/man8/Makefile.am                   | 1 +
+index 8ab1b7572..5485076f9 100644
- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
+--- a/man/Makefile.am
- 3 files changed, 3 insertions(+), 2 deletions(-)
++++ b/man/Makefile.am
- rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
+@@ -8,7 +8,7 @@ dist_man_MANS = \
-
+ 	man1/ztest.1 \
-diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
+ 	man1/raidz_test.1 \
-index 8d7457a3e..101af7b6c 100644
+ 	man1/zvol_wait.1 \
---- a/man/man1/Makefile.am
+-	man1/arcstat.1 \
-+++ b/man/man1/Makefile.am
++	man8/arcstat.8 \
-@@ -1,4 +1,4 @@
+ 	\
--dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
+ 	man5/vdev_id.conf.5 \
-+dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
+ 	\
- EXTRA_DIST = cstyle.1
+diff --git a/man/man1/arcstat.1 b/man/man1/arcstat.1
- 
+index a69cd8937..dfe9c971b 100644
- 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
++++ b/man/man1/arcstat.1
 @@ -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
+ .Dd May 26, 2021
-+.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
+-.Dt ARCSTAT 1
- .SH NAME
++.Dt ARCSTAT 8
- arcstat \- report ZFS ARC and L2ARC statistics
+ .Os
- .SH SYNOPSIS
+ .
+ .Sh NAME

debian/templates/control.in

@@ -24,7 +24,8 @@ Build-Depends: asciidoc,
                quilt,
                rsync,
                xmlto,
-               zlib1g-dev
+               zlib1g-dev,
+               zstd
 Build-Conflicts: pve-headers-@KVNAME@,
 Vcs-Git: git://github.com/fabianishere/pve-edge-kernel.git
 Vcs-Browser: https://github.com/fabianishere/pve-edge-kernel

linux

@@ -1 +1 @@
-Subproject commit 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
+Subproject commit 62fb9874f5da54fdb243003b386128037319b219

zfs

@@ -1 +1 @@
-Subproject commit cb2e3360380ad465c2e5685941ae125b5cff463a
+Subproject commit c3b60ededa6e6ce36a457a54451ca153c4c630dc