update ABI file for 5.4.203-1-pve

(generated with debian/scripts/abi-generate)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "submodules/zfsonlinux"]
 	path = submodules/zfsonlinux
 	url = ../zfsonlinux
-[submodule "submodules/ubuntu-disco"]
-	path = submodules/ubuntu-disco
-	url = ../mirror_ubuntu-disco-kernel
+[submodule "submodules/ubuntu-focal"]
+	path = submodules/ubuntu-focal
+	url = ../mirror_ubuntu-focal-kernel

Makefile

@@ -1,12 +1,12 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
 KERNEL_MAJ=5
-KERNEL_MIN=0
-KERNEL_PATCHLEVEL=21
+KERNEL_MIN=4
+KERNEL_PATCHLEVEL=203
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=5
+KREL=1
 
-PKGREL=10
+PKGREL=1
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -31,7 +31,7 @@ SKIPABI=0
 
 BUILD_DIR=build
 
-KERNEL_SRC=ubuntu-disco
+KERNEL_SRC=ubuntu-focal
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
@@ -46,9 +46,11 @@ DIRS=KERNEL_SRC ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+USR_HDR_DEB=pve-kernel-libc-dev_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 
-DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}
+DEBS=${DST_DEB} ${HDR_DEB} ${USR_HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB}
 
 all: deb
 deb: ${DEBS}
@@ -102,7 +104,7 @@ ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
 
 .PHONY: upload
 upload: ${DEBS}
-	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch ${ARCH}
+	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch ${ARCH}
 
 .PHONY: distclean
 distclean: clean

README

@@ -3,7 +3,7 @@ KERNEL SOURCE:
 
 We currently use the Ubuntu kernel sources, available from:
 
- http://kernel.ubuntu.com/git/ubuntu/ubuntu-disco.git/
+ http://kernel.ubuntu.com/git/ubuntu/ubuntu-focal.git/
 
 Ubuntu will maintain those kernels till:
 
@@ -31,7 +31,7 @@ get applied with the `patch` tool. From a git point-of-view, the copied
 directory remains clean even with extra patches applied since it does not
 contain a .git directory, but a reference to the (still pristine) submodule:
 
-$ cat build/ubuntu-bionic/.git
+$ cat build/ubuntu-focal/.git
 
 If you mistakenly cloned the upstream repo as "normal" clone (not via the
 submodule mechanics) this means that you have a real .git directory with its

debian/changelog

@@ -1,28 +1,410 @@
-pve-kernel (5.0.21-10) pve pmg; urgency=medium
+pve-kernel (5.4.203-1) buster; urgency=medium
 
-  * update to Ubuntu-5.0.0-35.38
+  * update sources to Ubuntu-5.4.0-126.142
 
-  * bump ABI to 5.0.21-5
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Aug 2022 14:43:35 +0200
 
-  * avoid bouds error message about PC Speaker module being already registered
+pve-kernel (5.4.195-1) buster; urgency=medium
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Nov 2019 08:27:10 +0100
+  * update sources to Ubuntu-5.4.0-123.139
 
-pve-kernel (5.0.21-9) pve pmg; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jul 2022 13:19:46 +0200
 
-  * fix #2458: fix issues with Linux KVM guest on old Intel CPUs
+pve-kernel (5.4.192-1) buster; urgency=medium
 
- -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Nov 2019 14:12:37 +0100
+  * update sources to Ubuntu-5.4.0-122.138
 
-pve-kernel (5.0.21-8) pve pmg; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 23 Jun 2022 11:56:26 +0200
 
-  * update to Ubuntu-5.0.0-33.35
+pve-kernel (5.4.189-2) buster; urgency=medium
 
-  * bump ABI to 5.0.21-4
+  * update sources to Ubuntu-5.4.0-117.132
 
-  * update ZFS FPU/SIMD implementation to upstream proposal
+  * fixes: CVE-2022-1966, CVE-2022-21499, CVE-2022-28390, CVE-2022-29581,
+    CVE-2022-1116
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 17:49:13 +0200
+  * bump ABI to 5.4.189-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 13 Jun 2022 09:39:53 +0200
+
+pve-kernel (5.4.189-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-112.126
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 May 2022 07:10:20 +0200
+
+pve-kernel (5.4.178-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-108.122
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2022 15:16:31 +0200
+
+pve-kernel (5.4.174-2) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-105.119
+
+  * bump ABI to 5.4.174-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 10 Mar 2022 15:58:44 +0100
+
+pve-kernel (5.4.174-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-101.114
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Feb 2022 08:21:31 +0100
+
+pve-kernel (5.4.166-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-98.111
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 02 Feb 2022 08:05:40 +0100
+
+pve-kernel (5.4.162-2) buster; urgency=medium
+
+  * backport "vfs: fs_context: fix up param length parsing in
+    legacy_parse_param"
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Jan 2022 16:38:53 +0100
+
+pve-kernel (5.4.162-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-95.107
+
+  * bump ABI to 5.4.162-1
+
+  * update ZFS to 2.0.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:49:53 +0100
+
+pve-kernel (5.4.157-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-92.103
+
+  * bump ABI to 5.4.157-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Nov 2021 12:01:44 +0100
+
+pve-kernel (5.4.151-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-91.102
+
+  * bump ABI to 5.4.151-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Nov 2021 16:10:09 +0100
+
+pve-kernel (5.4.148-1) buster; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-90.101
+
+  * bump ABI to 5.4.148-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 18 Oct 2021 15:24:06 +0200
+
+pve-kernel (5.4.143-1) buster; urgency=medium
+
+  * update Sources to Ubuntu-5.4.0-89.100
+
+  * bump ABI to 5.4.143-1
+
+  * update ZFS to 2.0.6
+
+  * fix #3558: backport "bnx2x: Fix enabling network interfaces without VFs"
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:10:37 +0200
+
+pve-kernel (5.4.140-1) buster; urgency=medium
+
+  * update sources to 5.4.140 stable release based on Ubuntu-5.4.0-85.95
+
+  * ZFS: cherry-pick revert of "Consolidate arc_buf allocation checks" (ZFS GH
+    issue #11531)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Sep 2021 16:21:59 +0200
+
+pve-kernel (5.4.128-2) buster; urgency=medium
+
+  * cherry-pick fixes for CVE-2021-3656 and CVE-2021-3653
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 18 Aug 2021 16:20:02 +0200
+
+pve-kernel (5.4.128-1) buster; urgency=medium
+
+  * update sources to 5.4.128 stable release based on Ubuntu-5.4.0-81.91
+
+  * update ZFS to 2.0.5
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:32:02 +0200
+
+pve-kernel (5.4.124-2) buster; 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:43:44 +0200
+
+pve-kernel (5.4.124-1) buster; urgency=medium
+
+  * update sources to 5.4.124 stable release based on Ubuntu-5.4.0-78.87
+
+  * pve-kernel-libc-dev: add version to Provides dependency field for
+    linux-libc-dev to satisfy versioned dependencies from other packages
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Jun 2021 13:47:09 +0200
+
+pve-kernel (5.4.119-1) buster; urgency=medium
+
+  * update sources to 5.4.119 stable release based on Ubuntu-5.4.0-75.84
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Jun 2021 15:32:00 +0200
+
+pve-kernel (5.4.114-1) buster; urgency=medium
+
+  * update sources to 5.4.114 stable release based on Ubuntu-5.4.0-74.83
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 09 May 2021 17:13:05 +0200
+
+pve-kernel (5.4.106-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.106 stable release
+
+  * update ZFS to 2.0.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Mar 2021 11:08:47 +0100
+
+pve-kernel (5.4.103-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.103 stable release
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 07 Mar 2021 15:55:09 +0100
+
+pve-kernel (5.4.101-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.101 stable release
+
+  * fix #3320: backport "kvm: x86: replace kvm_spec_ctrl_test_value with
+    runtime test on the host"
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Feb 2021 13:13:09 +0100
+
+pve-kernel (5.4.98-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.98 stable release
+
+  * update ZFS to 2.0.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 16:33:27 +0100
+
+pve-kernel (5.4.86-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-66.74
+
+  * bump ABI to 5.4.86-1
+
+  * update ZFS to 2.0.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Jan 2021 14:56:38 +0100
+
+pve-kernel (5.4.78-2) pve pmg; urgency=medium
+
+  * revert commit 552b270b5784dc3 "scsi: be2iscsi: Fix a theoretical leak in
+    beiscsi_create_eqs()" to avoid hangs and kernel oopses on module load
+
+  * cherry-pick patch to allow unprivileged whiteout device creation
+
+  * bump ABI to 5.4.78-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Dec 2020 14:26:17 +0100
+
+pve-kernel (5.4.78-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-57.63
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Nov 2020 10:57:47 +0100
+
+pve-kernel (5.4.73-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-55.61
+
+  * update ZFS to 0.8.5
+
+  * downgrade unregister_netdev waiting to become free error from emergency to
+    error log
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 16 Nov 2020 10:52:16 +0100
+
+pve-kernel (5.4.65-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-49.53
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2020 15:40:22 +0200
+
+pve-kernel (5.4.60-2) pve pmg; urgency=medium
+
+  * improve guards against a packet offset calculation overflow for certain raw
+    packet sockets
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Sep 2020 10:24:50 +0200
+
+pve-kernel (5.4.60-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-46.50
+
+  * bump ABI to 5.4.60-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 31 Aug 2020 10:36:22 +0200
+
+pve-kernel (5.4.55-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-43.47
+
+  * bump ABI to 5.4.55-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Aug 2020 10:26:27 +0200
+
+pve-kernel (5.4.44-2) pve pmg; urgency=medium
+
+  * fix #2814: config: disable lockdown
+
+  * backport: cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
+
+  * bump ABI to 5.4.44-2
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 01 Jul 2020 16:37:57 +0200
+
+pve-kernel (5.4.44-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-38.42
+
+  * bump ABI to 5.4.44-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jun 2020 08:18:46 +0200
+
+pve-kernel (5.4.41-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.4.0-32.36
+
+  * update ZFS to 0.8.4
+
+  * Revert "scsi: lpfc: Fix broken Credit Recovery after driver load" as a
+    workaround for some LP Fibre Channel SCSI boxes.
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 May 2020 15:06:08 +0200
+
+pve-kernel (5.4.34-2) pve pmg; urgency=medium
+
+  * backport fix for overlayfs
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 07 May 2020 10:02:02 +0200
+
+pve-kernel (5.4.34-1) pve pmg; urgency=medium
+
+  * update to Ubuntu-5.4.0-30.34
+
+  * bump ABI to 5.4.34-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 06 May 2020 10:16:59 +0200
+
+pve-kernel (5.4.30-1) pve pmg; urgency=medium
+
+  * update to Ubuntu-5.4.0-24.28
+
+  * bump ABI to 5.4.30-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Apr 2020 09:12:42 +0200
+
+pve-kernel (5.4.27-1) pve pmg; urgency=medium
+
+  * update to Ubuntu-5.4.0-19.23
+
+  * bump ABI to 5.4.27-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Mar 2020 15:02:22 +0100
+
+pve-kernel (5.4.24-1) pve pmg; urgency=medium
+
+  * update to Ubuntu-5.4.0-18.22
+
+  * bump ABI to 5.4.24-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 09 Mar 2020 12:59:46 +0100
+
+pve-kernel (5.4.22-1) pve pmg; urgency=medium
+
+  * Initial Ubuntu Focal Kernel build, based on 5.4
+
+  * update sources to Ubuntu-5.4.0-17.21
+
+  * bump ABI to 5.4.22-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Mar 2020 15:49:45 +0100
+
+pve-kernel (5.3.18-2) pve pmg; urgency=medium
+
+  * bump ABI to 5.3.18-2
+
+  * update to Ubuntu-5.3.0-41.33
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 15 Feb 2020 15:11:52 +0100
+
+pve-kernel (5.3.18-1) pve pmg; urgency=medium
+
+  * bump ABI to 5.3.18-1
+
+  * update sources to Ubuntu-5.3.0-40.32
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 05 Feb 2020 11:49:10 +0100
+
+pve-kernel (5.3.13-3) pve pmg; urgency=medium
+
+  * backport fixes for information leak within a KVM guest
+
+  * bump ABI to 5.3.13-3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 31 Jan 2020 08:17:11 +0100
+
+pve-kernel (5.3.13-2) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.3.0-29.31
+
+  * update ZFS to 0.8.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2020 09:49:36 +0100
+
+pve-kernel (5.3.13-1) pve pmg; urgency=medium
+
+  * bump ABI to 5.3.13-1
+
+  * update sources to Ubuntu-5.3.0-25.27
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Dec 2019 07:18:14 +0100
+
+pve-kernel (5.3.10-1) pve pmg; urgency=medium
+
+  * bump ABI to 5.3.10-1
+
+  * update sources to Ubuntu-5.3.0-24.26
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Nov 2019 10:43:13 +0100
+
+pve-kernel (5.3.7-1) pve pmg; urgency=medium
+
+  * update sources to Ubuntu-5.3.0-20.21
+
+  * bump ABI to 5.3.7-1
+
+  * update ZFS submodule to include FPU/SIMD fixes
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 19:00:21 +0200
+
+pve-kernel (5.3.1-1) pve pmg; urgency=medium
+
+  * Initial Ubuntu Eoan Kernel build, based on 5.3
+
+  * update sources to Ubuntu-5.3.0-16.17
+
+  * bump ABI to 5.3.0-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Oct 2019 18:57:21 +0200
 
 pve-kernel (5.0.21-7) pve pmg; urgency=medium
 

debian/control.in

@@ -9,6 +9,7 @@ Build-Depends: asciidoc-base,
                cpio,
                debhelper (>= 10~),
                dh-python,
+               dwarves (>= 1.13~),
                file,
                flex,
                gcc (>= 8.3.0-6),
@@ -23,8 +24,9 @@ Build-Depends: asciidoc-base,
                libssl-dev,
                libtool,
                lintian,
+               lz4,
                perl-modules,
-               python-minimal,
+               python2-minimal,
                rsync,
                sed,
                sphinx-common,
@@ -68,3 +70,15 @@ Depends: busybox,
 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: any
+Provides: linux-libc-dev (=${binary:Version}),
+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.

debian/rules

@@ -15,6 +15,7 @@ CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
 
 PVE_KERNEL_PKG=pve-kernel-${KVNAME}
 PVE_HEADER_PKG=pve-headers-${KVNAME}
+PVE_USR_HEADER_PKG=pve-kernel-libc-dev
 LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
 KERNEL_SRC_COPY=${KERNEL_SRC}_tmp
 
@@ -32,6 +33,7 @@ PVE_CONFIG_OPTS= \
 -m CONFIG_JFS_FS \
 -m CONFIG_HFS_FS \
 -m CONFIG_HFSPLUS_FS \
+-e CIFS_SMB_DIRECT \
 -e CONFIG_BRIDGE \
 -e CONFIG_BRIDGE_NETFILTER \
 -e CONFIG_BLK_DEV_SD \
@@ -46,6 +48,21 @@ PVE_CONFIG_OPTS= \
 -d CONFIG_MEMCG_DISABLED \
 -e CONFIG_MEMCG_SWAP_ENABLED \
 -e CONFIG_HYPERV \
+-m CONFIG_VFIO_IOMMU_TYPE1 \
+-m CONFIG_VFIO_VIRQFD \
+-m CONFIG_VFIO \
+-m CONFIG_VFIO_PCI \
+-m CONFIG_USB_XHCI_HCD \
+-m CONFIG_USB_XHCI_PCI \
+-m CONFIG_USB_EHCI_HCD \
+-m CONFIG_USB_EHCI_PCI \
+-m CONFIG_USB_EHCI_HCD_PLATFORM \
+-m CONFIG_USB_OHCI_HCD \
+-m CONFIG_USB_OHCI_HCD_PCI \
+-m CONFIG_USB_OHCI_HCD_PLATFORM \
+-d CONFIG_USB_OHCI_HCD_SSB \
+-m CONFIG_USB_UHCI_HCD \
+-d CONFIG_USB_SL811_HCD_ISO \
 -e CONFIG_MEMCG_KMEM \
 -d CONFIG_DEFAULT_CFQ \
 -e CONFIG_DEFAULT_DEADLINE \
@@ -56,6 +73,11 @@ PVE_CONFIG_OPTS= \
 -d CONFIG_UNWINDER_ORC \
 -d CONFIG_UNWINDER_GUESS \
 -e CONFIG_UNWINDER_FRAME_POINTER \
+--set-str CONFIG_SYSTEM_TRUSTED_KEYS ""\
+--set-str CONFIG_SYSTEM_REVOCATION_KEYS ""\
+-d CONFIG_SECURITY_LOCKDOWN_LSM \
+-d CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
+--set-str CONFIG_LSM yama,integrity,apparmor \
 -e CONFIG_PAGE_TABLE_ISOLATION
 
 debian/control: $(wildcard debian/*.in)
@@ -71,7 +93,7 @@ debian/control: $(wildcard debian/*.in)
 
 build: .compile_mark .tools_compile_mark .modules_compile_mark
 
-install: .install_mark .tools_install_mark .headers_install_mark
+install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
 	dh_installdocs -A debian/copyright debian/SOURCE
 	dh_installchangelogs
 	dh_installman
@@ -81,7 +103,7 @@ install: .install_mark .tools_install_mark .headers_install_mark
 
 binary: install
 	debian/rules fwcheck abicheck
-	dh_strip -N${PVE_HEADER_PKG}
+	dh_strip -N${PVE_HEADER_PKG} -N${PVE_USR_HEADER_PKG}
 	dh_makeshlibs
 	dh_shlibdeps
 	dh_installdeb
@@ -108,7 +130,7 @@ binary: install
 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
 	# install zfs drivers
 	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
-	install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
 	# remove firmware
 	rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
 	# strip debug info
@@ -191,6 +213,23 @@ binary: install
 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@
 
+.usr_headers_install_mark: PKG_DIR = debian/${PVE_USR_HEADER_PKG}
+.usr_headers_install_mark: OUT_DIR = ${PKG_DIR}/usr
+.usr_headers_install_mark: .config_mark
+	rm -rf '${PKG_DIR}'
+	mkdir -p  '${PKG_DIR}'
+	$(MAKE) -C ${KERNEL_SRC} headers_check ARCH=$(KERNEL_HEADER_ARCH)
+	$(MAKE) -C ${KERNEL_SRC} headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
+	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
+	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
+
+# Move include/asm to arch-specific directory
+	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
+	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	test ! -d $(OUT_DIR)/include/arch || \
+		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	touch $@
+
 .modules_compile_mark: ${MODULES}/zfs.ko
 	touch $@
 
@@ -206,6 +245,7 @@ ${MODULES}/zfs.ko: .compile_mark
 	cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
 	cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/
 	cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/
 
 fwlist-${KVNAME}: .compile_mark .modules_compile_mark
 	debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp

debian/scripts/export-patchqueue

@@ -6,7 +6,7 @@ top=$(pwd)
 
 if [ "$#" -ne 3 ]; then
     echo "USAGE: $0 repo patchdir ref"
-    echo "\t exports patches from 'repo' to 'patchdir' based on 'ref'"
+    printf "\t exports patches from 'repo' to 'patchdir' based on 'ref'\n"
     exit 1
 fi
 
@@ -26,10 +26,9 @@ git format-patch \
     --zero-commit \
     --no-signature \
     --diff-algorithm=myers \
-    --output-dir \
-    "${top}/${kernel_patchdir}" \
+    --output-directory="${top}/${kernel_patchdir}" \
     "${base_ref}.."
 
-git checkout ${base_ref}
+git checkout "${base_ref}"
 
 cd "${top}"

debian/scripts/find-firmware.pl

@@ -8,7 +8,7 @@ die "no directory to scan" if !$dir;
 
 die "no such directory" if ! -d $dir;
 
-die "strange directory name" if $dir !~ m|^(.*/)?(5.0.\d+\-\d+\-pve)(/+)?$|;
+die "strange directory name: $dir" if $dir !~ m|^(.*/)?(5.\d.\d+\-\d+\-pve)(/+)?$|;
 
 my $apiver = $2;
 

fwlist-previous

@@ -14,6 +14,9 @@ advansys/mcode.bin kernel/drivers/scsi/advansys.ko
 agere_ap_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 agere_sta_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 aic94xx-seq.fw kernel/drivers/scsi/aic94xx/aic94xx.ko
+amd/amd_sev_fam17h_model0xh.sbin kernel/drivers/crypto/ccp/ccp.ko
+amd/amd_sev_fam17h_model3xh.sbin kernel/drivers/crypto/ccp/ccp.ko
+amd/amd_sev_fam19h_model0xh.sbin kernel/drivers/crypto/ccp/ccp.ko
 amdgpu/banks_k_2_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/bonaire_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/bonaire_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -95,6 +98,37 @@ amdgpu/mullins_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/mullins_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/mullins_uvd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/mullins_vce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi10_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_ce_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_mec2_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_mec_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_me_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_pfp_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/navi14_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/oland_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/oland_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/oland_mc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -195,6 +229,7 @@ amdgpu/raven_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_dmcu.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/raven_kicker_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -202,6 +237,16 @@ amdgpu/raven_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/raven_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
+amdgpu/renoir_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/si58_mc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/stoney_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/stoney_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -280,7 +325,6 @@ amdgpu/vega20_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega20_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega20_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega20_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/vega20_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega20_uvd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega20_vce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vegam_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -415,9 +459,9 @@ bnx2/bnx2-mips-09-6.2.1b.fw kernel/drivers/net/ethernet/broadcom/bnx2.ko
 bnx2/bnx2-rv2p-06-6.0.15.fw kernel/drivers/net/ethernet/broadcom/bnx2.ko
 bnx2/bnx2-rv2p-09-6.0.17.fw kernel/drivers/net/ethernet/broadcom/bnx2.ko
 bnx2/bnx2-rv2p-09ax-6.0.17.fw kernel/drivers/net/ethernet/broadcom/bnx2.ko
-bnx2x/bnx2x-e1-7.13.1.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
-bnx2x/bnx2x-e1h-7.13.1.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
-bnx2x/bnx2x-e2-7.13.1.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
+bnx2x/bnx2x-e1-7.13.11.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
+bnx2x/bnx2x-e1h-7.13.11.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
+bnx2x/bnx2x-e2-7.13.11.0.fw kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
 brcm/bcm43xx-0.fw kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcmsmac.ko
 brcm/bcm43xx_hdr-0.fw kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcmsmac.ko
 brcm/brcmfmac43012-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
@@ -438,6 +482,7 @@ brcm/brcmfmac4339-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfm
 brcm/brcmfmac43430a0-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac43430-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac43455-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
+brcm/brcmfmac43456-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4350c2-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4350-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4354-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
@@ -536,6 +581,7 @@ dvb_nova_12mhz_b0.inp kernel/drivers/media/common/siano/smsmdtv.ko
 dvb_nova_12mhz.inp kernel/drivers/media/common/siano/smsmdtv.ko
 dvb_rio.inp kernel/drivers/media/common/siano/smsmdtv.ko
 dvb-tuner-si2141-a10-01.fw kernel/drivers/media/tuners/si2157.ko
+dvb-tuner-si2157-a30-01.fw kernel/drivers/media/tuners/si2157.ko
 dvb-tuner-si2158-a20-01.fw kernel/drivers/media/tuners/si2157.ko
 dvb-usb-af9015.fw kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9015.ko
 dvb-usb-af9035-02.fw kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9035.ko
@@ -642,27 +688,33 @@ hfi1_dc8051.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko
 hfi1_fabric.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko
 hfi1_pcie.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko
 hfi1_sbus.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko
-i1480-phy-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
-i1480-pre-phy-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
-i1480-usb-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
+i1480-phy-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko
+i1480-pre-phy-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko
+i1480-usb-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko
 i2400m-fw-usb-1.5.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
 i6050-fw-usb-1.5.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
 i915/bxt_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/bxt_guc_ver9_29.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/bxt_huc_ver01_07_1398.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/bxt_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/bxt_huc_ver01_8_2893.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/cnl_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/glk_dmc_ver1_04.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/glk_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/glk_huc_ver03_01_2893.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/icl_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/icl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/icl_huc_ver8_4_3238.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/kbl_dmc_ver1_04.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/kbl_guc_ver9_39.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/kbl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/kbl_huc_ver02_00_1810.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/skl_dmc_ver1_27.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/skl_guc_ver9_33.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/skl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/skl_huc_ver01_07_1398.bin kernel/drivers/gpu/drm/i915/i915.ko
+i915/tgl_dmc_ver2_04.bin kernel/drivers/gpu/drm/i915/i915.ko
 intel/ibt-11-5.ddc kernel/drivers/bluetooth/btintel.ko
 intel/ibt-11-5.sfi kernel/drivers/bluetooth/btintel.ko
 intel/ibt-12-16.ddc kernel/drivers/bluetooth/btintel.ko
 intel/ibt-12-16.sfi kernel/drivers/bluetooth/btintel.ko
+intel/ice/ddp/ice.pkg kernel/drivers/net/ethernet/intel/ice/ice.ko
 ipw2100-1.3.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko
 ipw2100-1.3-i.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko
 ipw2100-1.3-p.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko
@@ -705,20 +757,23 @@ iwlwifi-7265-17.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
 iwlwifi-7265D-29.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
 iwlwifi-8000C-36.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
 iwlwifi-8265-36.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-9000-pu-a0-jf-a0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-9000-pu-a0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-9000-pu-b0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-9260-th-a0-jf-a0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-9260-th-b0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-a0-hr-a0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-a0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-b0-hr-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-b0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuQnj-a0-hr-a0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuQnj-a0-jf-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuQnj-b0-hr-b0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuQnj-f0-hr-a0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-su-z0-43.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-9000-pu-b0-jf-b0-46.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-9260-th-b0-jf-b0-46.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-cc-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-a0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-b0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-c0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-a0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-b0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-b0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-f0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuZ-a0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuZ-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-gf-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ty-a0-gf-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
 kaweth/new_code.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/new_code_fix.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/trigger_code.bin kernel/drivers/net/usb/kaweth.ko
@@ -785,9 +840,18 @@ me4000_firmware.bin kernel/drivers/staging/comedi/drivers/me4000.ko
 mediatek/mt7610e.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0e.ko
 mediatek/mt7610e.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0u.ko
 mediatek/mt7610u.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0u.ko
+mediatek/mt7615_cr4.bin kernel/drivers/net/wireless/mediatek/mt76/mt7615/mt7615e.ko
+mediatek/mt7615_n9.bin kernel/drivers/net/wireless/mediatek/mt76/mt7615/mt7615e.ko
+mediatek/mt7615_rom_patch.bin kernel/drivers/net/wireless/mediatek/mt76/mt7615/mt7615e.ko
 mediatek/mt7622pr2h.bin kernel/drivers/bluetooth/btmtkuart.ko
 mediatek/mt7650e.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0e.ko
-mellanox/mlxsw_spectrum-13.1910.622.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
+mediatek/mt7663pr2h.bin kernel/drivers/bluetooth/btmtksdio.ko
+mediatek/mt7663pr2h.bin kernel/drivers/bluetooth/btmtkuart.ko
+mediatek/mt7663pr2h.bin kernel/drivers/bluetooth/btusb.ko
+mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btmtksdio.ko
+mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btmtkuart.ko
+mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btusb.ko
+mellanox/mlxsw_spectrum-13.2000.1886.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
 mixart/miXart8AES.xlx kernel/sound/pci/mixart/snd-mixart.ko
 mixart/miXart8.elf kernel/sound/pci/mixart/snd-mixart.ko
 mixart/miXart8.xlx kernel/sound/pci/mixart/snd-mixart.ko
@@ -807,13 +871,21 @@ mrvl/sd8887_uapsta.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
 mrvl/sd8887_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
 mrvl/sd8897_uapsta.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
 mrvl/sd8897_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
-mrvl/sd8997_uapsta.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
-mrvl/sd8997_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
+mrvl/sd8987_uapsta.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
+mrvl/sd8987_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
+mrvl/sdsd8977_combo_v2.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
+mrvl/sdsd8977_combo_v2.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
+mrvl/sdsd8997_combo_v4.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
+mrvl/sdsd8997_combo_v4.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
 mrvl/usb8766_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_usb.ko
 mrvl/usb8797_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_usb.ko
 mrvl/usb8801_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_usb.ko
 mrvl/usbusb8997_combo_v4.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_usb.ko
 mt7601u.bin kernel/drivers/net/wireless/mediatek/mt7601u/mt7601u.ko
+mt7603_e1.bin kernel/drivers/net/wireless/mediatek/mt76/mt7603/mt7603e.ko
+mt7603_e2.bin kernel/drivers/net/wireless/mediatek/mt76/mt7603/mt7603e.ko
+mt7628_e1.bin kernel/drivers/net/wireless/mediatek/mt76/mt7603/mt7603e.ko
+mt7628_e2.bin kernel/drivers/net/wireless/mediatek/mt76/mt7603/mt7603e.ko
 mt7662.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2e.ko
 mt7662.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.ko
 mt7662_rom_patch.bin kernel/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2e.ko
@@ -836,6 +908,8 @@ myri10ge_ethp_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko
 myri10ge_eth_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko
 myri10ge_rss_ethp_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko
 myri10ge_rss_eth_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko
+netronome/nic_AMDA0058-0011_2x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko
+netronome/nic_AMDA0058-0012_2x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko
 netronome/nic_AMDA0081-0001_1x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko
 netronome/nic_AMDA0081-0001_4x10.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko
 netronome/nic_AMDA0096-0001_2x10.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko
@@ -1067,6 +1141,10 @@ prism_ap_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 prism_sta_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
 qat_895xcc.bin kernel/drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko
 qat_895xcc_mmp.bin kernel/drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc.ko
+qat_c3xxx.bin kernel/drivers/crypto/qat/qat_c3xxx/qat_c3xxx.ko
+qat_c3xxx_mmp.bin kernel/drivers/crypto/qat/qat_c3xxx/qat_c3xxx.ko
+qat_c62x.bin kernel/drivers/crypto/qat/qat_c62x/qat_c62x.ko
+qat_c62x_mmp.bin kernel/drivers/crypto/qat/qat_c62x/qat_c62x.ko
 qed/qed_init_values_zipped-8.37.7.0.bin kernel/drivers/net/ethernet/qlogic/qed/qed.ko
 ql2100_fw.bin kernel/drivers/scsi/qla2xxx/qla2xxx.ko
 ql2200_fw.bin kernel/drivers/scsi/qla2xxx/qla2xxx.ko
@@ -1345,6 +1423,7 @@ rtl_nic/rtl8106e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8106e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8107e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8107e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
+rtl_nic/rtl8125a-3.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168d-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168d-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
@@ -1352,6 +1431,7 @@ rtl_nic/rtl8168e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168e-3.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168f-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168f-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
+rtl_nic/rtl8168fp-3.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168g-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168g-3.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8168h-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
@@ -1360,6 +1440,7 @@ rtl_nic/rtl8402-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8411-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8411-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtlwifi/rtl8188efw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rtl8188ee.ko
+rtlwifi/rtl8188eufw.bin kernel/drivers/staging/rtl8188eu/r8188eu.ko
 rtlwifi/rtl8192cfw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rtl8192ce.ko
 rtlwifi/rtl8192cfwU_B.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rtl8192ce.ko
 rtlwifi/rtl8192cfwU.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rtl8192ce.ko
@@ -1385,9 +1466,11 @@ rtlwifi/rtl8723bu_nic.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.
 rtlwifi/rtl8723efw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rtl8723ae.ko
 rtlwifi/rtl8821aefw_29.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rtl8821ae.ko
 rtlwifi/rtl8821aefw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rtl8821ae.ko
-rtlwifi/rtl8822befw.bin kernel/drivers/staging/rtlwifi/r8822be.ko
+rtw88/rtw8723d_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88.ko
 rtw88/rtw8822b_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88.ko
 rtw88/rtw8822c_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88.ko
+rtw88/rtw8822c_wow_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88.ko
+s5k4ecgx.bin kernel/drivers/media/i2c/s5k4ecgx.ko
 sd8385.bin kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko
 sd8385_helper.bin kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko
 sd8686.bin kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko

patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch

@@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index 87f1fc9801d7..4ef868f1f244 100755
+index 06c1e9e3bc38..6e7012175600 100755
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -33,10 +33,14 @@ else
+@@ -34,10 +34,14 @@ else
  	VERSION=$KBUILD_BUILD_VERSION
  fi
  

patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch

@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
-index 808e2b914015..b0ad54384826 100644
+index d174d3a566aa..885e18c72c87 100644
 --- a/net/bridge/br_stp_if.c
 +++ b/net/bridge/br_stp_if.c
-@@ -259,10 +259,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
+@@ -256,10 +256,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
  		return false;
  
  	list_for_each_entry(p, &br->port_list, list) {

patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch

@@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 988d3f3ad29d..cd1a1bddb997 100644
+index 1520dc3ad4d2..d3db42dface6 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3312,6 +3312,15 @@
+@@ -3489,6 +3489,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).
@@ -75,10 +75,10 @@ index 988d3f3ad29d..cd1a1bddb997 100644
  				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 e2479ccedc91..4981d0ec7960 100644
+index ff07d35046b0..81f720abe39e 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
  }
  fs_initcall_sync(pci_apply_final_quirks);
  
@@ -185,8 +185,8 @@ index e2479ccedc91..4981d0ec7960 100644
  /*
   * 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
-@@ -4564,6 +4664,8 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
+@@ -4948,6 +5048,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 */

patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch

@@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 6f50cf5b9ef5..a3d541f23204 100644
+index 98edde13ec17..8344711583bc 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);
+@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);
  EXPORT_SYMBOL_GPL(halt_poll_ns);
  
  /* Default doubles per-vcpu halt_poll_ns. */

patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch

@@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index 2bb8fa904b9f..835edf9b2954 100644
+index 435dfebf5867..82c2afe46ebf 100644
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
-@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
+@@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);
   * VMX and be a hypervisor for its own guests. If nested=0, guests may not
   * use VMX instructions.
   */

patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Wed, 7 Oct 2020 17:18:28 +0200
+Subject: [PATCH] net: core: downgrade unregister_netdevice refcount leak from
+ emergency to error
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ 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 f2c6fc836f9d..8940c12333b0 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -9368,7 +9368,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
+ 		refcnt = netdev_refcnt_read(dev);
+ 
+ 		if (refcnt && time_after(jiffies, warning_time + 10 * 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);
+ 			warning_time = jiffies;
+ 		}

patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ilya Dryomov <idryomov@gmail.com>
-Date: Fri, 3 May 2019 17:27:03 +0200
-Subject: [PATCH] rbd: don't assert on writes to snapshots
-
-The check added in commit 721c7fc701c7 ("block: fail op_is_write()
-requests to read-only partitions") was lifted in commit a32e236eb93e
-("Partially revert "block: fail op_is_write() requests to read-only
-partitions"").  Basic things like user triggered writes and discards
-are still caught, but internal kernel users can submit anything.  In
-particular, ext4 will attempt to write to the superblock if it detects
-errors in the filesystem, even if the filesystem is mounted read-only
-on a read-only partition.
-
-The assert is overkill regardless.
-
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- drivers/block/rbd.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
-index 1e92b61d0bd5..339cdd4062bb 100644
---- a/drivers/block/rbd.c
-+++ b/drivers/block/rbd.c
-@@ -3664,8 +3664,12 @@ static void rbd_queue_workfn(struct work_struct *work)
- 		goto err_rq;
- 	}
- 
--	rbd_assert(op_type == OBJ_OP_READ ||
--		   rbd_dev->spec->snap_id == CEPH_NOSNAP);
-+	if (op_type != OBJ_OP_READ && rbd_dev->spec->snap_id != CEPH_NOSNAP) {
-+		rbd_warn(rbd_dev, "%s on read-only snapshot",
-+			 obj_op_name(op_type));
-+		result = -EIO;
-+		goto err;
-+	}
- 
- 	/*
- 	 * Quit early if the mapped snapshot no longer exists.  It's

patches/kernel/0007-vfs-allow-unprivileged-whiteout-creation.patch

@@ -0,0 +1,122 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Miklos Szeredi <mszeredi@redhat.com>
+Date: Thu, 14 May 2020 16:44:23 +0200
+Subject: [PATCH] vfs: allow unprivileged whiteout creation
+
+Whiteouts, unlike real device node should not require privileges to create.
+
+The general concern with device nodes is that opening them can have side
+effects.  The kernel already avoids zero major (see
+Documentation/admin-guide/devices.txt).  To be on the safe side the patch
+explicitly forbids registering a char device with 0/0 number (see
+cdev_add()).
+
+This guarantees that a non-O_PATH open on a whiteout will fail with ENODEV;
+i.e. it won't have any side effect.
+
+Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+(cherry picked from commit a3c751a50fe6bbe50eb7622a14b18b361804ee0c)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/char_dev.c                 |  3 +++
+ fs/namei.c                    | 21 +++------------------
+ include/linux/device_cgroup.h |  3 +++
+ include/linux/fs.h            |  6 +++++-
+ 4 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/fs/char_dev.c b/fs/char_dev.c
+index c5e6eff5a381..ba0ded7842a7 100644
+--- a/fs/char_dev.c
++++ b/fs/char_dev.c
+@@ -483,6 +483,9 @@ int cdev_add(struct cdev *p, dev_t dev, unsigned count)
+ 	p->dev = dev;
+ 	p->count = count;
+ 
++	if (WARN_ON(dev == WHITEOUT_DEV))
++		return -EBUSY;
++
+ 	error = kobj_map(cdev_map, dev, count, NULL,
+ 			 exact_match, exact_lock, p);
+ 	if (error)
+diff --git a/fs/namei.c b/fs/namei.c
+index f9c46c7abd80..a5e907558b88 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -3690,12 +3690,14 @@ EXPORT_SYMBOL(user_path_create);
+ 
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
+ {
++	bool is_whiteout = S_ISCHR(mode) && dev == WHITEOUT_DEV;
+ 	int error = may_create(dir, dentry);
+ 
+ 	if (error)
+ 		return error;
+ 
+-	if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD))
++	if ((S_ISCHR(mode) || S_ISBLK(mode)) && !is_whiteout &&
++	    !capable(CAP_MKNOD))
+ 		return -EPERM;
+ 
+ 	if (!dir->i_op->mknod)
+@@ -4530,9 +4532,6 @@ static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
+ 	    (flags & RENAME_EXCHANGE))
+ 		return -EINVAL;
+ 
+-	if ((flags & RENAME_WHITEOUT) && !capable(CAP_MKNOD))
+-		return -EPERM;
+-
+ 	if (flags & RENAME_EXCHANGE)
+ 		target_flags = 0;
+ 
+@@ -4668,20 +4667,6 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+ 	return do_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
+ }
+ 
+-int vfs_whiteout(struct inode *dir, struct dentry *dentry)
+-{
+-	int error = may_create(dir, dentry);
+-	if (error)
+-		return error;
+-
+-	if (!dir->i_op->mknod)
+-		return -EPERM;
+-
+-	return dir->i_op->mknod(dir, dentry,
+-				S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
+-}
+-EXPORT_SYMBOL(vfs_whiteout);
+-
+ int readlink_copy(char __user *buffer, int buflen, const char *link)
+ {
+ 	int len = PTR_ERR(link);
+diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h
+index 8557efe096dc..fc989487c273 100644
+--- a/include/linux/device_cgroup.h
++++ b/include/linux/device_cgroup.h
+@@ -62,6 +62,9 @@ static inline int devcgroup_inode_mknod(int mode, dev_t dev)
+ 	if (!S_ISBLK(mode) && !S_ISCHR(mode))
+ 		return 0;
+ 
++	if (S_ISCHR(mode) && dev == WHITEOUT_DEV)
++		return 0;
++
+ 	if (S_ISBLK(mode))
+ 		type = DEVCG_DEV_BLOCK;
+ 	else
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 2bd06577c02a..fc22bade5b21 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -1719,7 +1719,11 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct ino
+ extern int vfs_rmdir(struct inode *, struct dentry *);
+ extern int vfs_unlink(struct inode *, struct dentry *, struct inode **);
+ extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *, struct inode **, unsigned int);
+-extern int vfs_whiteout(struct inode *, struct dentry *);
++
++static inline int vfs_whiteout(struct inode *dir, struct dentry *dentry)
++{
++	return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
++}
+ 
+ extern struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode,
+ 				  int open_flag);

patches/kernel/0007-x86-fpu-backport-copy_kernel_to_XYZ_err-helpers.patch

@@ -1,103 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Wed, 3 Apr 2019 18:41:50 +0200
-Subject: [PATCH] x86/fpu: backport copy_kernel_to_XYZ_err helpers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-partial cherry-pick from upstream 5.2 "86/fpu: Restore from kernel
-memory on the 64-bit path too"
-commit 926b21f37b072ae4c117052de45a975c6d468fec
-Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-
-Namely, only backport the added helpers, none of the semantic changes.
-
-relevant parts of the original commit message:
-> In order to avoid that mess, copy the FPU state from userland, validate
-> it and then load it. The copy_kernel_…() helpers are basically just
-> like the old helpers except that they operate on kernel memory and the
-> fault handler just sets the error value and the caller handles it.
-
-Link: https://lkml.kernel.org/r/20190403164156.19645-22-bigeasy@linutronix.de
-(partial cherry picked from commit 926b21f37b072ae4c117052de45a975c6d468fec)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- arch/x86/include/asm/fpu/internal.h | 43 +++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h
-index fa2c93cb42a2..f3193ab0a2fb 100644
---- a/arch/x86/include/asm/fpu/internal.h
-+++ b/arch/x86/include/asm/fpu/internal.h
-@@ -122,6 +122,21 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu);
- 	err;								\
- })
- 
-+#define kernel_insn_err(insn, output, input...)				\
-+({									\
-+	int err;							\
-+	asm volatile("1:" #insn "\n\t"					\
-+		     "2:\n"						\
-+		     ".section .fixup,\"ax\"\n"				\
-+		     "3:  movl $-1,%[err]\n"				\
-+		     "    jmp  2b\n"					\
-+		     ".previous\n"					\
-+		     _ASM_EXTABLE(1b, 3b)				\
-+		     : [err] "=r" (err), output				\
-+		     : "0"(0), input);					\
-+	err;								\
-+})
-+
- #define kernel_insn(insn, output, input...)				\
- 	asm volatile("1:" #insn "\n\t"					\
- 		     "2:\n"						\
-@@ -158,6 +173,14 @@ static inline void copy_kernel_to_fxregs(struct fxregs_state *fx)
- 	}
- }
- 
-+static inline int copy_kernel_to_fxregs_err(struct fxregs_state *fx)
-+{
-+	if (IS_ENABLED(CONFIG_X86_32))
-+		return kernel_insn_err(fxrstor %[fx], "=m" (*fx), [fx] "m" (*fx));
-+	else
-+		return kernel_insn_err(fxrstorq %[fx], "=m" (*fx), [fx] "m" (*fx));
-+}
-+
- static inline int copy_user_to_fxregs(struct fxregs_state __user *fx)
- {
- 	if (IS_ENABLED(CONFIG_X86_32))
-@@ -175,6 +198,11 @@ static inline void copy_kernel_to_fregs(struct fregs_state *fx)
- 	kernel_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
- }
- 
-+static inline int copy_kernel_to_fregs_err(struct fregs_state *fx)
-+{
-+	return kernel_insn_err(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
-+}
-+
- static inline int copy_user_to_fregs(struct fregs_state __user *fx)
- {
- 	return user_insn(frstor %[fx], "=m" (*fx), [fx] "m" (*fx));
-@@ -400,6 +428,21 @@ static inline int copy_user_to_xregs(struct xregs_state __user *buf, u64 mask)
- 	return err;
- }
- 
-+/*
-+ * Restore xstate from kernel space xsave area, return an error code instead of
-+ * an exception.
-+ */
-+static inline int copy_kernel_to_xregs_err(struct xregs_state *xstate, u64 mask)
-+{
-+	u32 lmask = mask;
-+	u32 hmask = mask >> 32;
-+	int err;
-+
-+	XSTATE_OP(XRSTOR, xstate, lmask, hmask, err);
-+
-+	return err;
-+}
-+
- /*
-  * These must be called with preempt disabled. Returns
-  * 'true' if the FPU state is still intact and we can

patches/kernel/0008-KVM-x86-introduce-is_pae_paging.patch

@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Thu, 6 Jun 2019 18:52:44 +0200
-Subject: [PATCH] KVM: x86: introduce is_pae_paging
-
-Checking for 32-bit PAE is quite common around code that fiddles with
-the PDPTRs.  Add a function to compress all checks into a single
-invocation.
-
-Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit bf03d4f9334728bf7c8ffc7de787df48abd6340e)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- arch/x86/kvm/vmx/nested.c | 3 +--
- arch/x86/kvm/vmx/vmx.c    | 4 ++--
- arch/x86/kvm/x86.c        | 8 ++++----
- arch/x86/kvm/x86.h        | 5 +++++
- 4 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
-index d7c52e748966..7bb5801b5e11 100644
---- a/arch/x86/kvm/vmx/nested.c
-+++ b/arch/x86/kvm/vmx/nested.c
-@@ -944,8 +944,7 @@ static int nested_vmx_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool ne
- 		 * If PAE paging and EPT are both on, CR3 is not used by the CPU and
- 		 * must not be dereferenced.
- 		 */
--		if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu) &&
--		    !nested_ept) {
-+		if (is_pae_paging(vcpu) && !nested_ept) {
- 			if (!load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3)) {
- 				*entry_failure_code = ENTRY_FAIL_PDPTE;
- 				return 1;
-diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index 835edf9b2954..86c5ab3728ac 100644
---- a/arch/x86/kvm/vmx/vmx.c
-+++ b/arch/x86/kvm/vmx/vmx.c
-@@ -2729,7 +2729,7 @@ static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
- 		      (unsigned long *)&vcpu->arch.regs_dirty))
- 		return;
- 
--	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {
-+	if (is_pae_paging(vcpu)) {
- 		vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]);
- 		vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]);
- 		vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]);
-@@ -2741,7 +2741,7 @@ void ept_save_pdptrs(struct kvm_vcpu *vcpu)
- {
- 	struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
- 
--	if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {
-+	if (is_pae_paging(vcpu)) {
- 		mmu->pdptrs[0] = vmcs_read64(GUEST_PDPTR0);
- 		mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1);
- 		mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2);
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index eed14def2a6b..c69f12af5c01 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -725,7 +725,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
- 	gfn_t gfn;
- 	int r;
- 
--	if (is_long_mode(vcpu) || !is_pae(vcpu) || !is_paging(vcpu))
-+	if (!is_pae_paging(vcpu))
- 		return false;
- 
- 	if (!test_bit(VCPU_EXREG_PDPTR,
-@@ -968,8 +968,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
- 	if (is_long_mode(vcpu) &&
- 	    (cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)))
- 		return 1;
--	else if (is_pae(vcpu) && is_paging(vcpu) &&
--		   !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
-+	else if (is_pae_paging(vcpu) &&
-+		 !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
- 		return 1;
- 
- 	kvm_mmu_new_cr3(vcpu, cr3, skip_tlb_flush);
-@@ -8590,7 +8590,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
- 		kvm_update_cpuid(vcpu);
- 
- 	idx = srcu_read_lock(&vcpu->kvm->srcu);
--	if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu)) {
-+	if (is_pae_paging(vcpu)) {
- 		load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu));
- 		mmu_reset_needed = 1;
- 	}
-diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
-index 7e89ed889707..03de3f3c830c 100644
---- a/arch/x86/kvm/x86.h
-+++ b/arch/x86/kvm/x86.h
-@@ -139,6 +139,11 @@ static inline int is_paging(struct kvm_vcpu *vcpu)
- 	return likely(kvm_read_cr0_bits(vcpu, X86_CR0_PG));
- }
- 
-+static inline bool is_pae_paging(struct kvm_vcpu *vcpu)
-+{
-+	return !is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu);
-+}
-+
- static inline u32 bit(int bitno)
- {
- 	return 1 << (bitno & 31);

patches/kernel/0008-SUNRPC-Fix-READ_PLUS-crasher.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Thu, 30 Jun 2022 16:48:18 -0400
+Subject: [PATCH] SUNRPC: Fix READ_PLUS crasher
+
+commit a23dd544debcda4ee4a549ec7de59e85c3c8345c upstream.
+
+Looks like there are still cases when "space_left - frag1bytes" can
+legitimately exceed PAGE_SIZE. Ensure that xdr->end always remains
+within the current encode buffer.
+
+Reported-by: Bruce Fields <bfields@fieldses.org>
+Reported-by: Zorro Lang <zlang@redhat.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=216151
+Fixes: 6c254bf3b637 ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ net/sunrpc/xdr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
+index cb8740d15633..daa4165f1179 100644
+--- a/net/sunrpc/xdr.c
++++ b/net/sunrpc/xdr.c
+@@ -608,7 +608,7 @@ static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
+ 	 */
+ 	xdr->p = (void *)p + frag2bytes;
+ 	space_left = xdr->buf->buflen - xdr->buf->len;
+-	if (space_left - nbytes >= PAGE_SIZE)
++	if (space_left - frag1bytes >= PAGE_SIZE)
+ 		xdr->end = (void *)p + PAGE_SIZE;
+ 	else
+ 		xdr->end = (void *)p + space_left - frag1bytes;

patches/kernel/0009-NFSv4-pnfs-Fix-a-use-after-free-bug-in-open.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Trond Myklebust <trond.myklebust@hammerspace.com>
+Date: Tue, 2 Aug 2022 15:48:50 -0400
+Subject: [PATCH] NFSv4/pnfs: Fix a use-after-free bug in open
+
+commit 2135e5d56278ffdb1c2e6d325dc6b87f669b9dac upstream.
+
+If someone cancels the open RPC call, then we must not try to free
+either the open slot or the layoutget operation arguments, since they
+are likely still in use by the hung RPC call.
+
+Fixes: 6949493884fe ("NFSv4: Don't hold the layoutget locks across multiple RPC calls")
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/nfs/nfs4proc.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index eee2d67d3ac9..831a16fec616 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -3041,12 +3041,13 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+ 	}
+ 
+ out:
+-	if (opendata->lgp) {
+-		nfs4_lgopen_release(opendata->lgp);
+-		opendata->lgp = NULL;
+-	}
+-	if (!opendata->cancelled)
++	if (!opendata->cancelled) {
++		if (opendata->lgp) {
++			nfs4_lgopen_release(opendata->lgp);
++			opendata->lgp = NULL;
++		}
+ 		nfs4_sequence_free_slot(&opendata->o_res.seq_res);
++	}
+ 	return ret;
+ }
+ 

patches/kernel/0010-scsi-Revert-scsi-qla2xxx-Fix-disk-failure-to-redisco.patch

@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nilesh Javali <njavali@marvell.com>
+Date: Tue, 12 Jul 2022 22:20:36 -0700
+Subject: [PATCH] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
+
+commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream.
+
+This fixes the regression of NVMe discovery failure during driver load
+time.
+
+This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
+
+Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
+Cc: stable@vger.kernel.org
+Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
+Signed-off-by: Nilesh Javali <njavali@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/scsi/qla2xxx/qla_init.c | 5 ++---
+ drivers/scsi/qla2xxx/qla_nvme.c | 5 -----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
+index 1800eb0aad1c..c662c8af6cc1 100644
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -5422,8 +5422,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 	if (atomic_read(&fcport->state) == FCS_ONLINE)
+ 		return;
+ 
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	rport_ids.node_name = wwn_to_u64(fcport->node_name);
+ 	rport_ids.port_name = wwn_to_u64(fcport->port_name);
+ 	rport_ids.port_id = fcport->d_id.b.domain << 16 |
+@@ -5519,7 +5517,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 		qla2x00_reg_remote_port(vha, fcport);
+ 		break;
+ 	case MODE_TARGET:
+-		qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+ 		if (!vha->vha_tgt.qla_tgt->tgt_stop &&
+ 			!vha->vha_tgt.qla_tgt->tgt_stopped)
+ 			qlt_fc_port_added(vha, fcport);
+@@ -5534,6 +5531,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 		break;
+ 	}
+ 
++	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
++
+ 	if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
+ 		if (fcport->id_changed) {
+ 			fcport->id_changed = 0;
+diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
+index a15af048cd82..f0de7089e9ae 100644
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
++++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -36,11 +36,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
+ 		(fcport->nvme_flag & NVME_FLAG_REGISTERED))
+ 		return 0;
+ 
+-	if (atomic_read(&fcport->state) == FCS_ONLINE)
+-		return 0;
+-
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
+ 
+ 	memset(&req, 0, sizeof(struct nvme_fc_port_info));

patches/kernel/0011-ext4-recover-csum-seed-of-tmp_inode-after-migrating-.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Li Lingfeng <lilingfeng3@huawei.com>
+Date: Fri, 17 Jun 2022 14:25:15 +0800
+Subject: [PATCH] ext4: recover csum seed of tmp_inode after migrating to
+ extents
+
+[ Upstream commit 07ea7a617d6b278fb7acedb5cbe1a81ce2de7d0c ]
+
+When migrating to extents, the checksum seed of temporary inode
+need to be replaced by inode's, otherwise the inode checksums
+will be incorrect when swapping the inodes data.
+
+However, the temporary inode can not match it's checksum to
+itself since it has lost it's own checksum seed.
+
+mkfs.ext4 -F /dev/sdc
+mount /dev/sdc /mnt/sdc
+xfs_io -fc "pwrite 4k 4k" -c "fsync" /mnt/sdc/testfile
+chattr -e /mnt/sdc/testfile
+chattr +e /mnt/sdc/testfile
+umount /dev/sdc
+fsck -fn /dev/sdc
+
+========
+...
+Pass 1: Checking inodes, blocks, and sizes
+Inode 13 passes checks, but checksum does not match inode.  Fix? no
+...
+========
+
+The fix is simple, save the checksum seed of temporary inode, and
+recover it after migrating to extents.
+
+Fixes: e81c9302a6c3 ("ext4: set csum seed in tmp inode while migrating to extents")
+Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Link: https://lore.kernel.org/r/20220617062515.2113438-1-lilingfeng3@huawei.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/ext4/migrate.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
+index c5b2ea1a9372..1faa8e4ffb9d 100644
+--- a/fs/ext4/migrate.c
++++ b/fs/ext4/migrate.c
+@@ -435,7 +435,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	struct inode *tmp_inode = NULL;
+ 	struct migrate_struct lb;
+ 	unsigned long max_entries;
+-	__u32 goal;
++	__u32 goal, tmp_csum_seed;
+ 	uid_t owner[2];
+ 
+ 	/*
+@@ -483,6 +483,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	 * the migration.
+ 	 */
+ 	ei = EXT4_I(inode);
++	tmp_csum_seed = EXT4_I(tmp_inode)->i_csum_seed;
+ 	EXT4_I(tmp_inode)->i_csum_seed = ei->i_csum_seed;
+ 	i_size_write(tmp_inode, i_size_read(inode));
+ 	/*
+@@ -593,6 +594,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	 * the inode is not visible to user space.
+ 	 */
+ 	tmp_inode->i_blocks = 0;
++	EXT4_I(tmp_inode)->i_csum_seed = tmp_csum_seed;
+ 
+ 	/* Reset the extent details */
+ 	ext4_ext_tree_init(handle, tmp_inode);

patches/kernel/0012-drm-i915-gt-Serialize-TLB-invalidates-with-GT-resets.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris.p.wilson@intel.com>
+Date: Tue, 12 Jul 2022 16:21:33 +0100
+Subject: [PATCH] drm/i915/gt: Serialize TLB invalidates with GT resets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit a1c5a7bf79c1faa5633b918b5c0666545e84c4d1 ]
+
+Avoid trying to invalidate the TLB in the middle of performing an
+engine reset, as this may result in the reset timing out. Currently,
+the TLB invalidate is only serialised by its own mutex, forgoing the
+uncore lock, but we can take the uncore->lock as well to serialise
+the mmio access, thereby serialising with the GDRST.
+
+Tested on a NUC5i7RYB, BIOS RYBDWi35.86A.0380.2019.0517.1530 with
+i915 selftest/hangcheck.
+
+Cc: stable@vger.kernel.org  # v4.4 and upper
+Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
+Reported-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Tested-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
+Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
+Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org
+(cherry picked from commit 33da97894758737895e90c909f16786052680ef4)
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/gpu/drm/i915/gt/intel_gt.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
+index c8c070375d29..f6d7f5d307d7 100644
+--- a/drivers/gpu/drm/i915/gt/intel_gt.c
++++ b/drivers/gpu/drm/i915/gt/intel_gt.c
+@@ -339,6 +339,20 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
+ 	mutex_lock(&gt->tlb_invalidate_lock);
+ 	intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
+ 
++	spin_lock_irq(&uncore->lock); /* serialise invalidate with GT reset */
++
++	for_each_engine(engine, gt, id) {
++		struct reg_and_bit rb;
++
++		rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num);
++		if (!i915_mmio_reg_offset(rb.reg))
++			continue;
++
++		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
++	}
++
++	spin_unlock_irq(&uncore->lock);
++
+ 	for_each_engine(engine, gt, id) {
+ 		/*
+ 		 * HW architecture suggest typical invalidation time at 40us,
+@@ -353,7 +367,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
+ 		if (!i915_mmio_reg_offset(rb.reg))
+ 			continue;
+ 
+-		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
+ 		if (__intel_wait_for_register_fw(uncore,
+ 						 rb.reg, rb.bit, 0,
+ 						 timeout_us, timeout_ms,