Merge remote-tracking branch 'origin/master' into buster-pve-kernel-5.11

diff --cc Makefile
index 00133d42229106f0a43a9c550431f8836879612d,c751c774e65fbdee3d9dda90a8c8ed6662f3cd2a..0c2f54d9b689095533a95ebf38060ec1bf787931
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,12 -1,12 +1,12 @@@
  # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
  KERNEL_MAJ=5
  KERNEL_MIN=11
- KERNEL_PATCHLEVEL=21
+ KERNEL_PATCHLEVEL=22
  # increment KREL if the ABI changes (abicheck target in debian/rules)
  # rebuild packages with new KREL and run 'make abiupdate'
- KREL=1
+ KREL=2
  
- PKGREL=1~bpo10
 -PKGREL=4
++PKGREL=4~bpo10
  
  KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
  KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)

diff --cc debian/changelog
index 2fd05439cd2f09b3677b084741b03e4e2574d36e,44d5d5ac4d4e14b1b8772cf9b0cad430e3325941..d8971a12dbe6008ffbd82adacdad1919d66d578f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,41 +1,53 @@@
++pve-kernel (5.11.22-4~bpo10) bullseye; urgency=medium
++
++  * backport to Debian Buster based releases
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 17:53:37 +0200
++
+ pve-kernel (5.11.22-4) bullseye; urgency=medium
+ 
+   * fix CVE-2021-33909: seq_file: disallow extremely large seq buffer
+     allocations
+ 
+  -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Jul 2021 21:40:02 +0200
+ 
+ pve-kernel (5.11.22-3) bullseye; urgency=medium
+ 
+   * update ZFS to 2.0.5
+ 
+   * pull in upstream stable releases from v5.10.43, v5.12.10
+ 
+   * ensure 'performance' is the default frequency CPU governor again, as
+     schedutil seems to cause still some issues in with a few VM workloads
+ 
+  -- Proxmox Support Team <support@proxmox.com>  Sun, 11 Jul 2021 13:45:15 +0200
+ 
+ pve-kernel (5.11.22-2) bullseye; urgency=medium
+ 
+   * net: bridge: sync fdb to new unicast-filtering ports
+ 
+  -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Jul 2021 16:22:45 +0200
+ 
+ pve-kernel (5.11.22-1) bullseye; urgency=medium
+ 
+   * update sources to stable release 5.11.22 with Ubuntu-5.11.0-23.24
+ 
+   * pve-kernel-libc-dev: add version to Provides dependency field for
+     linux-libc-dev to satisfy versioned dependencies from other packages
+ 
+   * build perf with python3
+ 
+   * fixes #3465: keep unstripped kernel and module files, allowing one to use
+     kdump-tools
+ 
+  -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Jun 2021 08:53:17 +0200
+ 
 +pve-kernel (5.11.21-1~bpo10) buster; urgency=medium
 +
 +  * backport to Debian Buster based releases
 +
 + -- Proxmox Support Team <support@proxmox.com>  Wed, 02 Jun 2021 11:34:45 +0200
 +
  pve-kernel (5.11.21-1) bullseye; urgency=medium
  
    * update sources to stable release 5.11.21 with Ubuntu-5.11.0-19.20