bump version to 6.2.16-20

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
update ZFS to 2.1.14
2023-12-01 14:17:55 +01:00 · 2023-12-01 14:16:42 +01:00 · 2023-12-01 12:47:24 +01:00 · 2023-12-01 12:47:24 +01:00
38 changed files with 28299 additions and 29581 deletions
@@ -2,11 +2,11 @@ include /usr/share/dpkg/pkg-info.mk

 # also bump proxmox-kernel-meta if the default MAJ.MIN version changes!
 KERNEL_MAJ=6
-KERNEL_MIN=5
-KERNEL_PATCHLEVEL=13
+KERNEL_MIN=2
+KERNEL_PATCHLEVEL=16
 # increment KREL for every published package release!
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=5
+KREL=20

 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -44,7 +44,6 @@ DIRS=KERNEL_SRC ZFSDIR MODULES

 DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL).dsc
 DST_DEB=$(PACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
-SIGNED_TEMPLATE_DEB=$(PACKAGE)-signed-template_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
 META_DEB=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb
 HDR_DEB=$(HDRPACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
 META_HDR_DEB=proxmox-headers-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb
@@ -52,7 +51,7 @@ USR_HDR_DEB=proxmox-kernel-libc-dev_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
 LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
 LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_$(KERNEL_VER)-$(KREL)_$(ARCH).deb

-DEBS=$(DST_DEB) $(META_DEB) $(HDR_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) $(SIGNED_TEMPLATE_DEB) # $(USR_HDR_DEB)
+DEBS=$(DST_DEB) $(META_DEB) $(HDR_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) # $(USR_HDR_DEB)

 all: deb
 deb: $(DEBS)
@@ -1,37 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIGbjCCBFagAwIBAgIUTVo8veNlt0qzt14J+H2mhEB2SNUwDQYJKoZIhvcNAQEL
-BQAwgZMxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDzANBgNVBAcMBlZp
-ZW5uYTEmMCQGA1UECgwdUHJveG1veCBTZXJ2ZXIgU29sdXRpb25zIEdtYkgxFzAV
-BgNVBAMMDlNlY3VyZSBCb290IENBMSEwHwYJKoZIhvcNAQkBFhJvZmZpY2VAcHJv
-eG1veC5jb20wHhcNMjMwMzA2MTM1MTM0WhcNMzMwMzAzMTM1MTM0WjCBkzELMAkG
-A1UEBhMCQVQxDzANBgNVBAgMBlZpZW5uYTEPMA0GA1UEBwwGVmllbm5hMSYwJAYD
-VQQKDB1Qcm94bW94IFNlcnZlciBTb2x1dGlvbnMgR21iSDEXMBUGA1UEAwwOU2Vj
-dXJlIEJvb3QgQ0ExITAfBgkqhkiG9w0BCQEWEm9mZmljZUBwcm94bW94LmNvbTCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ59mP8gRLqsA6P53ejy0wMk
-0qLlICtDkPXsJoi4QRHjlPErxXv5zsZ4WqSG2bQ8EW95FAf8EOF6ge+G17neYt1w
-DmlvHzLBfqTJj5EBRgVjdWOjX3AkS/elOyzHdq4rKOteUSpQlMP4ub2cAUdy/8rp
-ouTbduttNv8mymAO89/kbXCEmKFiRS+av+hykFFyXH/KTRa2QnvLVadMEkmtA+vm
-+yQhYWCTD8hdisa1o3dKM0Z2l8LyzfIOsVXcwHHB7AhtR4tbLR9Tz2p/m9Gz//vj
-82dBaChh6kxIMZ8kACP28dA561R2P6ZcjzLSJ0Tq5e4tiW9SNEzuTYKTRvFeQoQh
-4usDdSF3ifXDuimShpv8Yaf4fntyIaUfnm6H5tvNr9b9Rw6ZL200LV5VugQ1EpfE
-F0+c3LQfurwT7svISgXSY62Fe/TiHFANOVXM5j3/Dr2ktKyce7BUGN4ewpWPvP99
-io+rdd4bTReuDh8j0nhsSdYKfvuOmvQpgL8Smzno54/hdpuO6cv+slCr1ApDexl8
-gAPPwCZRsH7aPc92g+YPzDm3k77RqkCXPA19KKQLYKvL7a+H3rnqgO81CdGFPHOz
-I5UruKLLeDGAWR0bo0JqDMEL8/oPh9IvGo8lFcTros0NEof6A7p8SGmxM2NodTo9
-spDVs84xDPlp4yX4u8A9AgMBAAGjgbcwgbQwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwEwYDVR0lBAwwCgYIKwYBBQUHAwMwHQYDVR0OBBYEFLXxsR5I
-LbWGkynLl1qjUgX4cs16MB8GA1UdIwQYMBaAFLXxsR5ILbWGkynLl1qjUgX4cs16
-MB0GA1UdEQQWMBSBEm9mZmljZUBwcm94bW94LmNvbTAdBgNVHRIEFjAUgRJvZmZp
-Y2VAcHJveG1veC5jb20wDQYJKoZIhvcNAQELBQADggIBAAUGWTt792ibVtE9yKgq
-9YtmybKGWjDHdMKl5AcnxLD60z7cEgcUBpEXaUbTzic5rz7fYhUM29LZkF8NIA2a
-rzrF0w+J1zZZKG2VvTWmdgynNNKQ/iTRbhgSZ94hEWOwumlEW4O6HwUN+VYFx8wf
-jvyWc1K6cdCc70IeC5POjYTlXKPoDq8ysPMLhxm7dsk7DDWcR0siMbYqGLLK5cJB
-lZE+9Q3Nj/q4m3odjK1ILrDGKqWWJgxopE21e903Ej+TNw+TduXygHqwVloEXUi4
-clmMMwCfhEBI9Vuy0+QSLxvrHKbwYpWd59RBQEsUubi8sT8Oh7njgmEd/Pf9uD7U
-1Rd9I+1MkNOZXyoyvaJQl9NZ9RpyG+ZbeQoFcL2CeCy0jJQQSilI5k4RtiDrGn6R
-GxlRL/FTvGWBkQGNwvoeFwD6i7zYainf1Z7f1Dh83MxKarxpAwX61K+rHpvAvjN/
-Hd4dslj5C+p188FnGaqiFlFAgVcF//F+yZFGYu1sTIQJ5f0C3LiFLeQYi3SPTf0L
-wk78eHgo6x1cIOM3/Ct4mflHBxnrfOJ9YdEAn2MklpDT5dif+9+zpN1myCQn4HoW
-OgoWIacSuvuFczHTQf2IX4ZEEE5SZwE31f7E0cqjgXmwbz1a81UMZHzvr71rDeWi
-oRgE3Pe1htzpOmw5Ygvjtn8k
-----END CERTIFICATE-----
@@ -1,37 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIGbzCCBFegAwIBAgIUakjebPHbd0vTEj9dEa3OF+gioGMwDQYJKoZIhvcNAQEL
-BQAwgZMxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDzANBgNVBAcMBlZp
-ZW5uYTEmMCQGA1UECgwdUHJveG1veCBTZXJ2ZXIgU29sdXRpb25zIEdtYkgxFzAV
-BgNVBAMMDlNlY3VyZSBCb290IENBMSEwHwYJKoZIhvcNAQkBFhJvZmZpY2VAcHJv
-eG1veC5jb20wHhcNMjMwMzA2MTQwNTI1WhcNMjcwNDE0MTQwNTI1WjCBmjELMAkG
-A1UEBhMCQVQxDzANBgNVBAgMBlZpZW5uYTEPMA0GA1UEBwwGVmllbm5hMSYwJAYD
-VQQKDB1Qcm94bW94IFNlcnZlciBTb2x1dGlvbnMgR21iSDEeMBwGA1UEAwwVU2Vj
-dXJlIEJvb3QgU2lnbiAyMDIzMSEwHwYJKoZIhvcNAQkBFhJvZmZpY2VAcHJveG1v
-eC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJGReH5i3aihb/
-frdbzzNueHBt7DC9W2/GXYf0wfl8izCXz2SYM/UIZavbpzF2uhgxli3Dj4M0FyR2
-oTKRseWyy+YMiwuhQcqCw0KRS6uOUiGjOtPHsEqDFO6DP8d1gNjYkF0jzY/CNf0N
-5Sc+w8jknQJgZ9G1RGcC2ihZATx2pgG9nYA30Op8qHyhcF2KrUmh8wpXky21u0Ja
-0/whsNFNSfQrvosgUroxLd2TvBdcBJu3SXt0B15jfY4Qssjmwgfs/oU8YGaAYnIp
-PLJRqzho/kpDA3PH2lsgxv5BJHQgDuODLj3Q3dx09C71Qdb3FlQ6z9hIdFUoPrvC
-kUpZ5lEwGUyvFZtJJQvGm/1BpDj1G7P8lqODyfkJ4c77XoH7M9z945HmxrfAyjP7
-9Jk8NXA9bSy+ygPHPHlTLEc10HKvk/SRg/sGGUveTr9C6rObfP8EmvXogpS46xSn
-W9s2vFSVFyOBvLpdIhU91McBFinvQaqY0r2XTNrsU3Zp5YG3z6hh6BOLCpD/pixc
-BQyfT8wGeI59dobVSSrWqt+1vNxO02I5t7Mlam687Ix1e3C/nk7+i44WMcmB8n+x
-Dq/v/L+UJlQ75u2dsaAiYUrGcsHQWAZ34oIAfec9qCgG+OLTwobwXXiOlaWiO51n
-0xCQ4ePK+vZuDxRHaXL7hOxFCe3iKwIDAQABo4GxMIGuMB0GA1UdDgQWBBRr/2t+
-Hu0KTVTbNhd31p7aJH15IjAfBgNVHSMEGDAWgBS18bEeSC21hpMpy5dao1IF+HLN
-ejAdBgNVHREEFjAUgRJvZmZpY2VAcHJveG1veC5jb20wHQYDVR0SBBYwFIESb2Zm
-aWNlQHByb3htb3guY29tMAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUH
-AwMwCwYDVR0PBAQDAgbAMA0GCSqGSIb3DQEBCwUAA4ICAQBYmLgWPJSK/pP/CkZE
-iYttW1Vd0Wm4DeZVSyUh2c9AI+A+IT5otEXjCflU8sYU4vm0eEtNwhmGdVf8oZe4
-tS/2eFawDAqEQ8xMsinbMJoqvcYx9uEZPiOOo3GS2YjfUy03Q3BAOV3rMFOjP4y+
-dfYF3IWnKQxvUV0wapRyDbT62plKt4UCtBagUPcm838YRD6ax+4yK/5sojMQM1IW
-2yGgEz8jeCyPI19Ots2RBZTJU2BZ1QqRPLybvLfsENtKgKqOE14BEp6WqtYBaj89
-QZD4tbP9Mqcmnj8AfG89pb1Fj6tq0MLZsboF6i0J7uuQ6CKkb5ksQhLODLMwAZi1
-1EAgWk5btwj6ZvoOHFOjAXGJ13tmUeYt/Zipyy/ie+5LSEdFevQ+zmZzsglfX3QK
-6skoBpHs3kLcuPsoe8uhCvn/b22lHkFdYYkIwIUQFPJgdvBzD8LYHnD8P60UdsQO
-vSSt9qzsq04DCEjwhmNJUeddL9ESGNL8vgpB9GvNjFEq6QMncELkdXDoAeqGFolE
-/dj+8sVq+34plRsvD1GDDx70UWk0ZtQlvhqDJ0kxeT+yYASrwLoujK44SLq8cMJr
-JYxDoxFOy5MSw+EzEXTP9LLkYNdPv/nzPbEz3lEctczyOgBWr22272Kdv3QCHBdP
-v4+vFbHnrXmu8cC9T45r2aX3rQ==
-----END CERTIFICATE-----
@@ -1,128 +1,10 @@
-proxmox-kernel-6.5 (6.5.13-5) bookworm; urgency=medium
+proxmox-kernel-6.2 (6.2.16-20) bookworm; urgency=medium

-  * revert a backport to avoid breaking copying files within a CIFS mount
+  * update sources to Ubuntu-6.2.0-39.40

-  * revert a backport for the thermal subsystem that causes early boot failure
-    for some hardware using the step-wise-throttle governor
+  * update ZFS to 2.1.14

- -- Proxmox Support Team <support@proxmox.com>  Fri, 05 Apr 2024 13:03:12 +0200
-
-proxmox-kernel-6.5 (6.5.13-4) bookworm; urgency=medium
-
-  * update sources to Ubuntu-6.5.0-32.32 based on stable-tree backports of up
-    to v6.1.77, v6.6.16
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 29 Mar 2024 15:28:57 +0100
-
-proxmox-kernel-6.5 (6.5.13-3) bookworm; urgency=medium
-
-  * updated sources to Ubuntu-6.5.0-27.28 to fix a regression in the tracing &
-    debugging related eventfs, potentially breaking bpftrace.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Mar 2024 11:45:08 +0100
-
-proxmox-kernel-6.5 (6.5.13-2) bookworm; urgency=medium
-
-  * update sources to Ubuntu-6.5.0-27.27 based on stable-tree backports of
-    v6.1.74, v6.6.13
-
-  * update ZFS to 2.2.3
-
-  * Revert "cherry-pick scheduler fix to avoid temporary VM freezes on NUMA
-    hosts" as user feedback did not show real improvement.
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Mar 2024 14:36:05 +0100
-
-proxmox-kernel-6.5 (6.5.13-1) bookworm; urgency=medium
-
-  * update sources to Ubuntu-6.5.0-20.20 based on v6.5.13 and some newer
-    stable-tree backports
-
-  * backport scheduler fix to avoid temporary VM freezes on NUMA hosts
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Feb 2024 14:50:54 +0100
-
-proxmox-kernel-6.5 (6.5.11-8) bookworm; urgency=medium
-
-  * fix #5077: cherry-pick revert for aacraid resets
-
-  * fix #5158: cherry-pick ext4 fix for high-CPU flush
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 30 Jan 2024 13:27:34 +0100
-
-proxmox-kernel-6.5 (6.5.11-7) bookworm; urgency=medium
-
-  * update ZFS to 2.2.2 to make it easier for users to ensure we're not
-    affected by any recently uncovered data integrity issues (which got
-    already patched out earlier via backports).
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 05 Dec 2023 10:44:02 +0100
-
-proxmox-kernel-6.5 (6.5.11-6) bookworm; urgency=medium
-
-  * cherry-pick ZFS fix for (rare) dirty dnode data corruption bug
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 29 Nov 2023 09:32:26 +0100
-
-proxmox-kernel-6.5 (6.5.11-5) bookworm; urgency=medium
-
-  * properly set CONFIG_VFIO_VIRQFD as a boolean
-
-  * cherry-pick fix for RCU stall issue after VM live migration
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 27 Nov 2023 20:52:25 +0100
-
-proxmox-kernel-6.5 (6.5.11-4) bookworm; urgency=medium
-
-  * add signed kernel variant for secure boot
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 20 Nov 2023 11:19:53 +0100
-
-proxmox-kernel-6.5 (6.5.11-3) bookworm; urgency=medium
-
-  * ZFS: pick bug-fixes staged for 2.2.1:
-    - add a tunable to disable BRT support and disable it by default
-    - fix block cloning between unencrypted and encrypted datasets
-    - disable block cloning by default
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 17:34:32 +0100
-
-proxmox-kernel-6.5 (6.5.11-2) bookworm; urgency=medium
-
-  * rebase on Ubuntu-6.5.0-14.14 to include a fix for viewing ast/bmc remote
-    consoles
-
-  * backport flexible-array-member fixes for the amdgpu module to avoid UBSAN
-    warnings.
-
-  * disable UBSAN bounds checking again completely, to many false-positives
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Nov 2023 18:19:51 +0100
-
-proxmox-kernel-6.5 (6.5.11-1) bookworm; urgency=medium
-
-  * update to v6.5.11 upstream stable release
-
-  * revert "memfd: improve userspace warnings for missing exec-related flags",
-    producing to much log noise without any benefit
-
-  * Revert "UBUNTU: SAUCE: ceph: make sure all the files successfully put
-    before unmounting"
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Nov 2023 15:40:29 +0100
-
-proxmox-kernel-6.5 (6.5.3-1) bookworm; urgency=medium
-
-  * disable UBSAN bounds checking to avoid false-positive oopses due to the
-    ZFS module using an older style for declaring flexible array member.
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Oct 2023 10:03:52 +0200
-
-proxmox-kernel-6.5 (6.5.3-1~1) bookworm; urgency=medium
-
-  * update kernel to 6.5 based Ubuntu 23.10 Mantic release
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 13 Oct 2023 15:28:11 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 01 Dec 2023 14:17:27 +0100

 proxmox-kernel-6.2 (6.2.16-19) bookworm; urgency=medium

@@ -25,7 +25,6 @@ Build-Depends: asciidoc-base,
               libtool,
               lintian,
               lz4,
-               python3-dev,
               python3-minimal,
               rsync,
               sphinx-common,
@@ -80,13 +79,6 @@ Description: Proxmox Kernel debug image
 to analyze kernel crashes. This package also contains the proxmox-kernel modules
 in their unstripped version.

-Package: proxmox-kernel-@KVNAME@-signed-template
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, make | build-essential | dpkg-dev
-Description: Template for signed kernel package
- This package is used to control code signing by the Proxmox signing
- service.
-
 Package: proxmox-kernel-libc-dev
 Section: devel
 Priority: optional
@@ -118,7 +110,7 @@ Section: admin
 Provides: linux-image-amd64, linux-image-generic, wireguard-modules (=1.0.0), pve-kernel-@KVMAJMIN@
 Replaces: pve-kernel-@KVMAJMIN@
 Priority: optional
-Depends: pve-firmware, proxmox-kernel-@KVNAME@-signed | proxmox-kernel-@KVNAME@, ${misc:Depends},
+Depends: pve-firmware, proxmox-kernel-@KVNAME@, ${misc:Depends},
 Description: Latest Proxmox Kernel Image
 This is a metapackage which will install the latest available
 proxmox kernel from the @KVMAJMIN@ series.
@@ -21,8 +21,6 @@ PMX_KERNEL_SERIES_PKG=proxmox-kernel-$(KERNEL_MAJMIN)
 PMX_DEBUG_KERNEL_PKG=proxmox-kernel-$(KVNAME)-dbgsym
 PMX_HEADER_PKG=proxmox-headers-$(KVNAME)
 PMX_USR_HEADER_PKG=proxmox-kernel-libc-dev
-PMX_KERNEL_SIGNING_TEMPLATE_PKG=proxmox-kernel-${KVNAME}-signed-template
-PMX_KERNEL_SIGNED_VERSION := $(shell echo ${DEB_VERSION} | sed -e 's/-/+/')
 LINUX_TOOLS_PKG=linux-tools-$(KERNEL_MAJMIN)
 KERNEL_SRC_COPY=$(KERNEL_SRC)_tmp

@@ -67,7 +65,7 @@ PMX_CONFIG_OPTS= \
 -e CONFIG_MEMCG_SWAP_ENABLED \
 -e CONFIG_HYPERV \
 -m CONFIG_VFIO_IOMMU_TYPE1 \
-e CONFIG_VFIO_VIRQFD \
+-m CONFIG_VFIO_VIRQFD \
 -m CONFIG_VFIO \
 -m CONFIG_VFIO_PCI \
 -m CONFIG_USB_XHCI_HCD \
@@ -100,10 +98,7 @@ PMX_CONFIG_OPTS= \
 --set-str CONFIG_LSM lockdown,yama,integrity,apparmor \
 -e CONFIG_PAGE_TABLE_ISOLATION \
 -e CONFIG_ARCH_HAS_CPU_FINALIZE_INIT \
-d CONFIG_GDS_FORCE_MITIGATION \
-d CONFIG_WQ_CPU_INTENSIVE_REPORT \
-d CONFIG_N_GSM \
-d UBSAN_BOUNDS \
+-d CONFIG_GDS_FORCE_MITIGATION

 debian/control: $(wildcard debian/*.in)
 	sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel.prerm.in > debian/$(PMX_KERNEL_PKG).prerm
@@ -120,17 +115,6 @@ debian/control: $(wildcard debian/*.in)
 	chmod +x debian/$(PMX_HEADER_PKG).postinst
 	sed -e 's/@KVNAME@/$(KVNAME)/g' -e 's/@KVMAJMIN@/$(KERNEL_MAJMIN)/g' < debian/control.in > debian/control

-	# signing-template
-	sed -e '1 s/proxmox-kernel/proxmox-kernel-signed/' -e '1 s/${DEB_VERSION}/${PMX_KERNEL_SIGNED_VERSION}/' < debian/changelog > debian/signing-template/changelog
-	sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/$(KERNEL_MAJMIN)/g' -e 's/@UNSIGNED_VERSION@/${DEB_VERSION}/g' < debian/signing-template/control.in > debian/signing-template/control
-	sed -e 's/@KVNAME@/${KVNAME}/g' < debian/signing-template/files.json.in > debian/signing-template/files.json
-	sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@PKG_VERSION@/${DEB_VERSION}/' < debian/signing-template/rules.in > debian/signing-template/rules
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/proxmox-kernel.prerm.in > debian/signing-template/prerm
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/proxmox-kernel.postrm.in > debian/signing-template/postrm
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/proxmox-kernel.postinst.in > debian/signing-template/postinst
-	rm debian/signing-template/*.in
-	cp debian/SOURCE debian/signing-template/
-
 build: .compile_mark .tools_compile_mark .modules_compile_mark

 install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
@@ -153,7 +137,7 @@ binary: install

 .config_mark:
 	cd $(KERNEL_SRC); scripts/config $(PMX_CONFIG_OPTS)
-	$(MAKE) -C $(KERNEL_SRC) olddefconfig
+	$(MAKE) -C $(KERNEL_SRC) oldconfig
 	# copy to allow building in parallel to kernel/module compilation without interference
 	rm -rf $(KERNEL_SRC_COPY)
 	cp -ar $(KERNEL_SRC) $(KERNEL_SRC_COPY)
@@ -173,7 +157,7 @@ binary: install
 	$(MAKE) -C $(KERNEL_SRC) INSTALL_MOD_PATH=$(BUILD_DIR)/debian/$(PMX_KERNEL_PKG)/ modules_install
 	# install zfs drivers
 	install -d -m 0755 debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
-	install -m 644 $(MODULES)/zfs.ko $(MODULES)/spl.ko debian/$(PMX_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/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
 	# remove firmware
 	rm -rf debian/$(PMX_KERNEL_PKG)/lib/firmware

@@ -209,30 +193,14 @@ endif
 	cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > debian/$(PMX_KERNEL_PKG)/lib/modprobe.d/blacklist_$(PMX_KERNEL_PKG).conf
 	rm -f debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/source
 	rm -f debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/build
-
-	# copy signing template contents
-	rm -rf debian/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}
-	mkdir -p debian/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/usr/share/code-signing/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/source-template/debian
-	cp -R debian/copyright \
-		debian/signing-template/rules \
-		debian/signing-template/control \
-		debian/signing-template/source \
-		debian/signing-template/changelog \
-		debian/signing-template/prerm \
-		debian/signing-template/postrm \
-		debian/signing-template/postinst \
-		debian/signing-template/SOURCE \
-		debian/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/usr/share/code-signing/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/source-template/debian
-	cp debian/signing-template/files.json debian/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/usr/share/code-signing/${PMX_KERNEL_SIGNING_TEMPLATE_PKG}/
-
 	touch $@

 .tools_compile_mark: .compile_mark
-	$(MAKE) -C $(KERNEL_SRC)/tools/perf prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
+	$(MAKE) -C $(KERNEL_SRC)/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
 	echo "checking GPL-2 only perf binary for library linkage with incompatible licenses.."
 	! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibbfd'
 	! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibcrypto'
-	$(MAKE) -C $(KERNEL_SRC)/tools/perf NO_LIBTRACEEVENT=1 man
+	$(MAKE) -C $(KERNEL_SRC)/tools/perf man
 	touch $@

 .tools_install_mark: .tools_compile_mark
@@ -314,8 +282,15 @@ $(MODULES)/zfs.ko: .compile_mark
 	cd $(MODULES)/$(ZFSDIR); ./autogen.sh
 	cd $(MODULES)/$(ZFSDIR); ./configure --with-config=kernel --with-linux=$(BUILD_DIR)/$(KERNEL_SRC) --with-linux-obj=$(BUILD_DIR)/$(KERNEL_SRC)
 	$(MAKE) -C $(MODULES)/$(ZFSDIR)
-	cp $(MODULES)/$(ZFSDIR)/module/zfs.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/spl.ko $(MODULES)/
+	cp $(MODULES)/$(ZFSDIR)/module/avl/zavl.ko $(MODULES)/
+	cp $(MODULES)/$(ZFSDIR)/module/nvpair/znvpair.ko $(MODULES)/
+	cp $(MODULES)/$(ZFSDIR)/module/unicode/zunicode.ko $(MODULES)/
+	cp $(MODULES)/$(ZFSDIR)/module/zcommon/zcommon.ko $(MODULES)/
+	cp $(MODULES)/$(ZFSDIR)/module/icp/icp.ko $(MODULES)/
+	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/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME) >fwlist.tmp
@@ -1,25 +0,0 @@
-Source: proxmox-kernel-signed-@KVMAJMIN@
-Section: kernel
-Priority: optional
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Standards-Version: 4.2.0
-Build-Depends: debhelper-compat (= 12), dh-exec, python3:any, rsync, sbsigntool, proxmox-kernel-@KVNAME@ (= @UNSIGNED_VERSION@)
-Rules-Requires-Root: no
-Vcs-Git: git://git.proxmox.com/git/pve-kernel
-Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git
-
-Package: proxmox-kernel-@KVNAME@-signed
-Section: admin
-Priority: optional
-Architecture: any
-Provides: linux-image-@KVNAME@-amd64, proxmox-kernel-@KVNAME@
-Depends: ${unsigned:Depends}, ${misc:Depends}
-Recommends: ${unsigned:Recommends}
-Suggests: ${unsigned:Suggests}
-Breaks: ${unsigned:Breaks}
-Conflicts: proxmox-kernel-@KVNAME@
-Replaces: proxmox-kernel-@KVNAME@
-Description: ${unsigned:DescriptionShort} (signed)
- ${unsigned:DescriptionLong}
- .
- This package contains the kernel image signed by the Proxmox Secure Boot CA.
@@ -1,13 +0,0 @@
-{
-	"packages": {
-		"proxmox-kernel-@KVNAME@": {
-			"trusted_certs": [],
-			"files": [
-				{
-					"sig_type": "efi",
-					"file": "boot/vmlinuz-@KVNAME@"
-				}
-			]
-		}
-	}
-}
@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-
-SHELL := bash -e
-
-export DH_OPTIONS
-
-include /usr/share/dpkg/architecture.mk
-
-KERNEL_VERSION=@KVNAME@
-IMAGE_PACKAGE_NAME=proxmox-kernel-$(KERNEL_VERSION)
-PACKAGE_NAME=$(IMAGE_PACKAGE_NAME)-signed
-PACKAGE_VERSION=@PKG_VERSION@
-PACKAGE_DIR=debian/$(PACKAGE_NAME)
-SIGNATURE_DIR=debian/signatures/${IMAGE_PACKAGE_NAME}
-
-build: build-arch build-indep
-build-arch:
-build-indep:
-
-clean:
-	dh_testdir
-	dh_clean
-
-binary: binary-arch binary-indep
-binary-arch:
-	dh_testdir
-	mkdir -p $(PACKAGE_DIR)/boot
-	rsync -a $(patsubst %,/boot/%-$(KERNEL_VERSION),config System.map vmlinuz) $(PACKAGE_DIR)/boot/
-	if [ -f $(SIGNATURE_DIR)/boot/vmlinuz-$(KERNEL_VERSION).sig ]; then \
-		sbattach --attach $(SIGNATURE_DIR)/boot/vmlinuz-$(KERNEL_VERSION).sig \
-			$(PACKAGE_DIR)/boot/vmlinuz-$(KERNEL_VERSION); \
-	else \
-		echo "No signature for image 'vmlinuz-$(KERNEL_VERSION)' found in '$(SIGNATURE_DIR)'"; \
-		false; \
-	fi
-	mkdir -p $(PACKAGE_DIR)/lib/modules/$(KERNEL_VERSION)
-	rsync -ar /lib/modules/$(KERNEL_VERSION)/ $(PACKAGE_DIR)/lib/modules/$(KERNEL_VERSION)/
-	mkdir -p $(PACKAGE_DIR)/lib/modprobe.d/
-	cp /lib/modprobe.d/blacklist_$(IMAGE_PACKAGE_NAME).conf $(PACKAGE_DIR)/lib/modprobe.d/
-	dh_install
-	dh_installchangelogs
-	dh_installdocs -A debian/copyright debian/SOURCE
-	dh_lintian
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	# Copy most package relations and description from unsigned package
-	for field in Depends Suggests Recommends Breaks; do \
-		echo >> debian/$(PACKAGE_NAME).substvars "unsigned:$$field=$$(dpkg-query -f '$${'$$field'}' -W $(IMAGE_PACKAGE_NAME))"; \
-	done
-	echo >> debian/$(PACKAGE_NAME).substvars "unsigned:DescriptionShort=$$(dpkg-query -f '$${Description}' -W $(IMAGE_PACKAGE_NAME) | head -n 1)"
-	echo >> debian/$(PACKAGE_NAME).substvars "unsigned:DescriptionLong=$$(dpkg-query -f '$${Description}' -W $(IMAGE_PACKAGE_NAME) | tail -n +2 | sed -rz 's/\$$/$${}/g; s/^ //; s/\n \.?/$${Newline}/g')"
-	dh_gencontrol -- -v$(PACKAGE_VERSION)
-	dh_md5sums
-	dh_builddeb
-binary-indep:
-
-.PHONY: build build-arch build-indep clean binary binary-arch binary-indep
@@ -1 +0,0 @@
-3.0 (native)
@@ -1,2 +1,2 @@
-debian-control-has-dbgsym-package (in section for proxmox-kernel-*-pve-dbgsym) Package [debian/control:*]
-license-problem-gfdl-invariants invariant part is: with the :ref:`invariant sections <fdl-invariant>` being list their titles, with the :ref:`front-cover texts <fdl-cover-texts>` being list, and with the :ref:`back-cover texts <fdl-cover-texts>` being list [ubuntu-kernel/Documentation/userspace-api/media/fdl-appendix.rst]
+proxmox-kernel-6.2 source: debian-control-has-dbgsym-package (in section for proxmox-kernel-*-pve-dbgsym) Package [debian/control:*]
+proxmox-kernel-6.2 source: license-problem-gfdl-invariants invariant part is: with the :ref:`invariant sections <fdl-invariant>` being list their titles, with the :ref:`front-cover texts <fdl-cover-texts>` being list, and with the :ref:`back-cover texts <fdl-cover-texts>` being list [ubuntu-kernel/Documentation/userspace-api/media/fdl-appendix.rst]
@@ -1,5 +1,4 @@
 3826.arm kernel/drivers/net/wireless/intersil/p54/p54spi.ko
-3826.eeprom kernel/drivers/net/wireless/intersil/p54/p54spi.ko
 3com/typhoon.bin kernel/drivers/net/ethernet/3com/typhoon.ko
 6fire/dmx6fireap.ihx kernel/sound/usb/6fire/snd-usb-6fire.ko
 6fire/dmx6firecf.bin kernel/sound/usb/6fire/snd-usb-6fire.ko
@@ -17,7 +16,6 @@ acenic/tg1.bin kernel/drivers/net/ethernet/alteon/acenic.ko
 acenic/tg2.bin kernel/drivers/net/ethernet/alteon/acenic.ko
 adaptec/starfire_rx.bin kernel/drivers/net/ethernet/adaptec/starfire.ko
 adaptec/starfire_tx.bin kernel/drivers/net/ethernet/adaptec/starfire.ko
-adf7242_firmware.bin kernel/drivers/net/ieee802154/adf7242.ko
 advansys/3550.bin kernel/drivers/scsi/advansys.ko
 advansys/38C0800.bin kernel/drivers/scsi/advansys.ko
 advansys/38C1600.bin kernel/drivers/scsi/advansys.ko
@@ -28,7 +26,6 @@ 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
-amd/amd_sev_fam19h_model1xh.sbin kernel/drivers/crypto/ccp/ccp.ko
 amdgpu/aldebaran_cap.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/aldebaran_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/aldebaran_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -173,8 +170,6 @@ amdgpu/gc_11_0_4_mes1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/gc_11_0_4_mes_2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/gc_11_0_4_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/gc_11_0_4_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/gc_9_4_3_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/gc_9_4_3_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/green_sardine_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/green_sardine_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/green_sardine_dmcub.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -394,8 +389,6 @@ amdgpu/psp_13_0_4_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_4_toc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_5_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_5_toc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/psp_13_0_6_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/psp_13_0_6_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_7_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_7_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/psp_13_0_8_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -434,7 +427,6 @@ 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_ta.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/renoir_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/sdma_4_4_2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/sdma_5_2_6.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/sdma_5_2_7.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/sdma_6_0_0.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -512,7 +504,6 @@ amdgpu/vangogh_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vcn_3_1_2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vcn_4_0_0.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vcn_4_0_2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
-amdgpu/vcn_4_0_3.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vcn_4_0_4.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega10_acg_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
 amdgpu/vega10_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
@@ -618,10 +609,9 @@ ath10k/QCA988X/hw2.0/firmware-2.bin kernel/drivers/net/wireless/ath/ath10k/ath10
 ath10k/QCA988X/hw2.0/firmware-3.bin kernel/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
 ath10k/QCA988X/hw2.0/firmware-4.bin kernel/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
 ath10k/QCA988X/hw2.0/firmware-5.bin kernel/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
-ath11k/QCA6390/hw2.0/* kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
-ath11k/QCN9074/hw1.0/* kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
-ath11k/WCN6855/hw2.0/* kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
-ath11k/WCN6855/hw2.1/* kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
+ath11k/QCA6390/hw2.0/amss.bin kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
+ath11k/QCA6390/hw2.0/board-2.bin kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
+ath11k/QCA6390/hw2.0/m3.bin kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
 ath3k-1.fw kernel/drivers/bluetooth/ath3k.ko
 ath6k/AR6003/hw2.0/athwlan.bin.z77 kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
 ath6k/AR6003/hw2.0/bdata.SD31.bin kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
@@ -678,7 +668,6 @@ atmel_at76c505amx-rfmd.bin kernel/drivers/net/wireless/atmel/at76c50x-usb.ko
 atmel_at76c506-wpa.bin kernel/drivers/net/wireless/atmel/atmel.ko
 atmel_at76c506.bin kernel/drivers/net/wireless/atmel/atmel.ko
 atsc_denver.inp kernel/drivers/media/common/siano/smsmdtv.ko
-av7110/bootcode.bin kernel/drivers/staging/media/av7110/dvb-ttpci.ko
 b43/ucode11.fw kernel/drivers/net/wireless/broadcom/b43/b43.ko
 b43/ucode13.fw kernel/drivers/net/wireless/broadcom/b43/b43.ko
 b43/ucode14.fw kernel/drivers/net/wireless/broadcom/b43/b43.ko
@@ -720,7 +709,6 @@ brcm/brcmbt4387*.bin kernel/drivers/bluetooth/hci_bcm4377.ko
 brcm/brcmbt4387*.ptb kernel/drivers/bluetooth/hci_bcm4377.ko
 brcm/brcmfmac*-pcie.*.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac*-pcie.*.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac*-pcie.*.txcap_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac*-pcie.*.txt kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac*-pcie.txt kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac*-sdio.*.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
@@ -768,7 +756,6 @@ brcm/brcmfmac43570-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/
 brcm/brcmfmac4358-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4359-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4359-sdio.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac4359c-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac43602-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4364b2-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4364b2-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
@@ -788,10 +775,6 @@ brcm/brcmfmac4377b3-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcm
 brcm/brcmfmac4377b3-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4378b1-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 brcm/brcmfmac4378b1-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac4378b3-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac4378b3-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac4387c2-pcie.bin kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
-brcm/brcmfmac4387c2-pcie.clm_blob kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
 c218tunx.cod kernel/drivers/tty/moxa.ko
 c320tunx.cod kernel/drivers/tty/moxa.ko
 carl9170-1.fw kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
@@ -989,7 +972,6 @@ 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
-i915/adlp_dmc.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/adlp_dmc_ver2_16.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/adlp_guc_69.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/adlp_guc_70.1.1.bin kernel/drivers/gpu/drm/i915/i915.ko
@@ -1017,9 +999,6 @@ i915/icl_huc_9.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/kbl_dmc_ver1_04.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/kbl_guc_70.1.1.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/kbl_huc_4.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/mtl_dmc.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/mtl_guc_70.bin kernel/drivers/gpu/drm/i915/i915.ko
-i915/mtl_huc_gsc.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/rkl_dmc_ver2_03.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/skl_dmc_ver1_27.bin kernel/drivers/gpu/drm/i915/i915.ko
 i915/skl_guc_70.1.1.bin kernel/drivers/gpu/drm/i915/i915.ko
@@ -1083,38 +1062,42 @@ 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-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-Qu-b0-hr-b0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-b0-jf-b0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-Qu-c0-hr-b0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuZ-a0-hr-b0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-QuZ-a0-jf-b0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-fm-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-fm-c0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-fm4-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-gf4-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-bz-a0-hr-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-cc-a0-77.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-gl-b0-fm-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-gl-c0-fm-c0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-a0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-a0-gf4-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-a0-hr-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-a0-mr-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-b0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-b0-gf4-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-b0-hr-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ma-b0-mr-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-fm-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-fm-c0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-gf4-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-hr-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-sc-a0-wh-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-so-a0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-so-a0-hr-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-so-a0-jf-b0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
-iwlwifi-ty-a0-gf-a0-83.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-a0-fm-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-a0-fm4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-a0-gf-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-a0-gf4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-BzBnj-b0-fm-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-b0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-b0-jf-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-Qu-c0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-b0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuQnj-b0-jf-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuZ-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-QuZ-a0-jf-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-SoSnj-a0-gf-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-SoSnj-a0-gf4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-SoSnj-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-SoSnj-a0-jf-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-SoSnj-a0-mr-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-fm-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-fm4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-gf-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-gf4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-bz-a0-mr-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-cc-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-gl-a0-fm-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-gl-b0-fm-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ma-a0-fm-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ma-a0-gf-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ma-a0-gf4-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ma-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ma-a0-mr-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-gf-a0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-hr-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-so-a0-jf-b0-72.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+iwlwifi-ty-a0-gf-a0-72.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
@@ -1222,7 +1205,6 @@ mellanox/lc_ini_bundle_2010_1006.bin kernel/drivers/net/ethernet/mellanox/mlxsw/
 mellanox/mlxsw_spectrum-13.2010.1006.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
 mellanox/mlxsw_spectrum2-29.2010.1006.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
 mellanox/mlxsw_spectrum3-30.2010.1006.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
-metronome.wbf kernel/drivers/video/fbdev/metronomefb.ko
 microchip/mscc_vsc8574_revb_int8051_29e8.bin kernel/drivers/net/phy/mscc/mscc.ko
 microchip/mscc_vsc8584_revb_int8051_fb48.bin kernel/drivers/net/phy/mscc/mscc.ko
 mixart/miXart8.elf kernel/sound/pci/mixart/snd-mixart.ko
@@ -1247,7 +1229,6 @@ mrvl/sd8897_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.
 mrvl/sd8987_uapsta.bin kernel/drivers/bluetooth/btmrvl_sdio.ko
 mrvl/sd8987_uapsta.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
 mrvl/sdiouart8997_combo_v4.bin kernel/drivers/net/wireless/marvell/mwifiex/mwifiex_sdio.ko
-mrvl/sdiouartiw416_combo_v0.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
@@ -1666,7 +1647,6 @@ nvidia/tu117/sec2/image.bin kernel/drivers/gpu/drm/nouveau/nouveau.ko
 nvidia/tu117/sec2/sig.bin kernel/drivers/gpu/drm/nouveau/nouveau.ko
 orinoco_ezusb_fw kernel/drivers/net/wireless/intersil/orinoco/orinoco_usb.ko
 ositech/Xilinx7OD.bin kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko
-otp.bin kernel/drivers/nfc/fdp/fdp.ko
 pca200e_ecd.bin2 kernel/drivers/atm/fore_200e.ko
 pcxhr/dspb1222e.b56 kernel/sound/pci/pcxhr/snd-pcxhr.ko
 pcxhr/dspb1222hr.b56 kernel/sound/pci/pcxhr/snd-pcxhr.ko
@@ -1691,14 +1671,14 @@ plfxlc/lifi-x.bin kernel/drivers/net/wireless/purelifi/plfxlc/plfxlc.ko
 prism2_ru.fw kernel/drivers/staging/wlan-ng/prism2_usb.ko
 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_4xxx.bin kernel/drivers/crypto/intel/qat/qat_4xxx/qat_4xxx.ko
-qat_4xxx_mmp.bin kernel/drivers/crypto/intel/qat/qat_4xxx/qat_4xxx.ko
-qat_895xcc.bin kernel/drivers/crypto/intel/qat/qat_dh895xcc/qat_dh895xcc.ko
-qat_895xcc_mmp.bin kernel/drivers/crypto/intel/qat/qat_dh895xcc/qat_dh895xcc.ko
-qat_c3xxx.bin kernel/drivers/crypto/intel/qat/qat_c3xxx/qat_c3xxx.ko
-qat_c3xxx_mmp.bin kernel/drivers/crypto/intel/qat/qat_c3xxx/qat_c3xxx.ko
-qat_c62x.bin kernel/drivers/crypto/intel/qat/qat_c62x/qat_c62x.ko
-qat_c62x_mmp.bin kernel/drivers/crypto/intel/qat/qat_c62x/qat_c62x.ko
+qat_4xxx.bin kernel/drivers/crypto/qat/qat_4xxx/qat_4xxx.ko
+qat_4xxx_mmp.bin kernel/drivers/crypto/qat/qat_4xxx/qat_4xxx.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.59.1.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
@@ -1942,7 +1922,6 @@ radeon/verde_me.bin kernel/drivers/gpu/drm/radeon/radeon.ko
 radeon/verde_pfp.bin kernel/drivers/gpu/drm/radeon/radeon.ko
 radeon/verde_rlc.bin kernel/drivers/gpu/drm/radeon/radeon.ko
 radeon/verde_smc.bin kernel/drivers/gpu/drm/radeon/radeon.ko
-ram.bin kernel/drivers/nfc/fdp/fdp.ko
 regulatory.db kernel/net/wireless/cfg80211.ko
 regulatory.db.p7s kernel/net/wireless/cfg80211.ko
 renesas_usb_fw.mem kernel/drivers/usb/host/xhci-pci.ko
@@ -1956,7 +1935,6 @@ rt2561s.bin kernel/drivers/net/wireless/ralink/rt2x00/rt61pci.ko
 rt2661.bin kernel/drivers/net/wireless/ralink/rt2x00/rt61pci.ko
 rt2860.bin kernel/drivers/net/wireless/ralink/rt2x00/rt2800pci.ko
 rt2870.bin kernel/drivers/net/wireless/ralink/rt2x00/rt2800usb.ko
-rt5677_elf_vad kernel/sound/soc/codecs/snd-soc-rt5677.ko
 rt73.bin kernel/drivers/net/wireless/ralink/rt2x00/rt73usb.ko
 rtl_bt/rtl8723a_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723b_config.bin kernel/drivers/bluetooth/btrtl.ko
@@ -1969,39 +1947,22 @@ rtl_bt/rtl8723cs_vf_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723cs_vf_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723cs_xx_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723cs_xx_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8723d_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8723d_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723ds_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8723ds_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8761a_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8761a_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8761b_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8761b_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8761bu_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8761bu_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8821a_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8821a_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8821c_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8821c_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8821cs_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8821cs_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8822b_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8822b_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8822cs_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8822cs_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8822cu_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8822cu_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8851bu_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8851bu_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852au_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852au_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8852bs_config.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8852bs_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852bu_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852bu_fw.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852cu_config.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_bt/rtl8852cu_fw.bin kernel/drivers/bluetooth/btrtl.ko
-rtl_bt/rtl8852cu_fw_v2.bin kernel/drivers/bluetooth/btrtl.ko
 rtl_nic/rtl8105e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8106e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko
 rtl_nic/rtl8106e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko
@@ -2030,7 +1991,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/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
+rtlwifi/rtl8188eufw.bin kernel/drivers/staging/r8188eu/r8188eu.ko
 rtlwifi/rtl8188fufw.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
 rtlwifi/rtl8192cfw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rtl8192ce.ko
 rtlwifi/rtl8192cfwU.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rtl8192ce.ko
@@ -2045,10 +2006,7 @@ rtlwifi/rtl8192cufw_TMSC.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192
 rtlwifi/rtl8192defw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rtl8192de.ko
 rtlwifi/rtl8192eefw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rtl8192ee.ko
 rtlwifi/rtl8192eu_nic.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
-rtlwifi/rtl8192fufw.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
 rtlwifi/rtl8192sefw.bin kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rtl8192se.ko
-rtlwifi/rtl8710bufw_SMIC.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
-rtlwifi/rtl8710bufw_UMC.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
 rtlwifi/rtl8712u.bin kernel/drivers/staging/rtl8712/r8712u.ko
 rtlwifi/rtl8723aufw_A.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
 rtlwifi/rtl8723aufw_B.bin kernel/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
@@ -2065,9 +2023,8 @@ rtw88/rtw8821c_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88_8821c.ko
 rtw88/rtw8822b_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88_8822b.ko
 rtw88/rtw8822c_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko
 rtw88/rtw8822c_wow_fw.bin kernel/drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko
-rtw89/rtw8851b_fw.bin kernel/drivers/net/wireless/realtek/rtw89/rtw89_8851b.ko
 rtw89/rtw8852a_fw.bin kernel/drivers/net/wireless/realtek/rtw89/rtw89_8852a.ko
-rtw89/rtw8852b_fw-1.bin kernel/drivers/net/wireless/realtek/rtw89/rtw89_8852b.ko
+rtw89/rtw8852b_fw.bin kernel/drivers/net/wireless/realtek/rtw89/rtw89_8852b.ko
 rtw89/rtw8852c_fw.bin kernel/drivers/net/wireless/realtek/rtw89/rtw89_8852c.ko
 sd8385.bin kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko
 sd8385_helper.bin kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko
@@ -21,7 +21,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/init/Makefile b/init/Makefile
-index cbac576c57d6..479b1253fcbe 100644
+index ec557ada3c12..72095034f338 100644
 --- a/init/Makefile
 +++ b/init/Makefile
@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:= PREEMPT_DYNAMIC
@@ -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 90ddf08e8409..eedfabda597f 100644
+index 5d47f23514d0..f06df077504b 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4285,6 +4285,15 @@
+@@ -4210,6 +4210,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 90ddf08e8409..eedfabda597f 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 c7a5718e5729..901f55b9ac64 100644
+index 592e1c4ae697..aebf6f412203 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -287,6 +287,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
 }
 fs_initcall_sync(pci_apply_final_quirks);
 
@@ -185,7 +185,7 @@ index c7a5718e5729..901f55b9ac64 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
-@@ -5091,6 +5191,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4974,6 +5074,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 },
@@ -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 5bbb5612b207..691ce10e7647 100644
+index 73fad57408f7..99ae3e468ce6 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -82,7 +82,7 @@ module_param(halt_poll_ns, uint, 0644);
+@@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644);
 EXPORT_SYMBOL_GPL(halt_poll_ns);
 
 /* Default doubles per-vcpu halt_poll_ns. */
@@ -14,10 +14,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/net/core/dev.c b/net/core/dev.c
-index 4811937f572d..8850f9be9044 100644
+index 555bbe774734..de2e0d0185fc 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -10355,7 +10355,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
+@@ -10262,7 +10262,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) {
@@ -10,13 +10,12 @@ This reverts commit 106b7a61c488d2022f44e3531ce33461c7c0685f.

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 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 da51a83b2829..9d9e7822eddf 100644
+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("
@@ -26,5 +25,5 @@ index da51a83b2829..9d9e7822eddf 100644
 -	char *__p = (char *)(p);				\
 +	unsigned char *__p = (unsigned char *)(p);		\
 	size_t __ret = SIZE_MAX;				\
- 	const size_t __p_size = __member_size(p);		\
+ 	size_t __p_size = __member_size(p);			\
 	if (__p_size != SIZE_MAX &&				\
@@ -78,10 +78,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 3 files changed, 21 insertions(+)

 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index 7bdc66abfc92..e2b67975869c 100644
+index 7ccdf991d18e..61aefeb3fdbc 100644
 --- a/arch/x86/kvm/cpuid.c
 +++ b/arch/x86/kvm/cpuid.c
-@@ -249,6 +249,12 @@ static u64 cpuid_get_supported_xcr0(struct kvm_cpuid_entry2 *entries, int nent)
+@@ -251,6 +251,12 @@ static u64 cpuid_get_supported_xcr0(struct kvm_cpuid_entry2 *entries, int nent)
 	return (best->eax | ((u64)best->edx << 32)) & kvm_caps.supported_xcr0;
 }
 
@@ -108,10 +108,10 @@ index b1658c0de847..12a02851ff57 100644
 
 int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu);
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index a5c8a01f7e7e..632d2d18041a 100644
+index ee603f4edce1..ff92ff41d5ce 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -5426,6 +5426,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
+@@ -5342,6 +5342,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
 		return 0;
 
@@ -4,17 +4,15 @@ Date: Mon, 18 Sep 2023 15:19:26 +0200
 Subject: [PATCH] allow opt-in to allow pass-through on broken hardware..

 adapted from https://github.com/kiler129/relax-intel-rmrr , licensed under MIT or GPL 2.0+
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 drivers/iommu/intel/iommu.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 8faccfdfe500..2b9ef40799a5 100644
+index 1c5ba4dbfe78..887667218e3b 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
-@@ -298,6 +298,7 @@ static int dmar_map_gfx = 1;
+@@ -297,6 +297,7 @@ static int dmar_map_gfx = 1;
 static int dmar_map_ipu = 1;
 static int intel_iommu_superpage = 1;
 static int iommu_identity_mapping;
@@ -22,7 +20,7 @@ index 8faccfdfe500..2b9ef40799a5 100644
 static int iommu_skip_te_disable;
 
 #define IDENTMAP_GFX		2
-@@ -359,6 +360,9 @@ static int __init intel_iommu_setup(char *str)
+@@ -358,6 +359,9 @@ static int __init intel_iommu_setup(char *str)
 		} else if (!strncmp(str, "tboot_noforce", 13)) {
 			pr_info("Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
 			intel_iommu_tboot_noforce = 1;
@@ -32,7 +30,7 @@ index 8faccfdfe500..2b9ef40799a5 100644
 		} else {
 			pr_notice("Unknown option - '%s'\n", str);
 		}
-@@ -2506,7 +2510,7 @@ static bool device_rmrr_is_relaxable(struct device *dev)
+@@ -2538,7 +2542,7 @@ static bool device_rmrr_is_relaxable(struct device *dev)
 		return false;
 
 	pdev = to_pci_dev(dev);
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+Date: Wed, 13 Sep 2023 08:26:47 +0300
+Subject: [PATCH] net: thunderbolt: Fix TCPv6 GSO checksum calculation
+
+Alex reported that running ssh over IPv6 does not work with
+Thunderbolt/USB4 networking driver. The reason for that is that driver
+should call skb_is_gso() before calling skb_is_gso_v6(), and it should
+not return false after calculates the checksum successfully. This probably
+was a copy paste error from the original driver where it was done properly.
+
+Reported-by: Alex Balcanquall <alex@alexbal.com>
+Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable")
+Cc: stable@vger.kernel.org
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Reviewed-by: Eric Dumazet <edumazet@google.com>
+Reviewed-by: Jiri Pirko <jiri@nvidia.com>
+Reviewed-by: Jiri Pirko <jiri@nvidia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/net/thunderbolt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
+index 990484776f2d..0c554a7a5ce4 100644
+--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
+@@ -1005,12 +1005,11 @@ static bool tbnet_xmit_csum_and_map(struct tbnet *net, struct sk_buff *skb,
+ 		*tucso = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
+ 					    ip_hdr(skb)->daddr, 0,
+ 					    ip_hdr(skb)->protocol, 0);
+-	} else if (skb_is_gso_v6(skb)) {
+	} else if (skb_is_gso(skb) && skb_is_gso_v6(skb)) {
+ 		tucso = dest + ((void *)&(tcp_hdr(skb)->check) - data);
+ 		*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+ 					  &ipv6_hdr(skb)->daddr, 0,
+ 					  IPPROTO_TCP, 0);
+-		return false;
+ 	} else if (protocol == htons(ETH_P_IPV6)) {
+ 		tucso = dest + skb_checksum_start_offset(skb) + skb->csum_offset;
+ 		*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Mon, 6 Nov 2023 10:17:02 +0100
-Subject: [PATCH] revert "memfd: improve userspace warnings for missing
- exec-related flags".
-
-This warning is telling userspace developers to pass MFD_EXEC and
-MFD_NOEXEC_SEAL to memfd_create().  Commit 434ed3350f57 ("memfd: improve
-userspace warnings for missing exec-related flags") made the warning more
-frequent and visible in the hope that this would accelerate the fixing of
-errant userspace.
-
-But the overall effect is to generate far too much dmesg noise.
-
-Fixes: 434ed3350f57 ("memfd: improve userspace warnings for missing exec-related flags")
-Reported-by: Damian Tometzki <dtometzki@fedoraproject.org>
-Closes: https://lkml.kernel.org/r/ZPFzCSIgZ4QuHsSC@fedora.fritz.box
-Cc: Aleksa Sarai <cyphar@cyphar.com>
-Cc: Christian Brauner <brauner@kernel.org>
-Cc: Daniel Verkamp <dverkamp@chromium.org>
-Cc: Jeff Xu <jeffxu@google.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: Shuah Khan <shuah@kernel.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
- (cherry picked from commit 2562d67b1bdf91c7395b0225d60fdeb26b4bc5a0)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- mm/memfd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/memfd.c b/mm/memfd.c
-index 2dba2cb6f0d0..1c077e98e116 100644
--- a/mm/memfd.c
-+++ b/mm/memfd.c
-@@ -282,7 +282,7 @@ static int check_sysctl_memfd_noexec(unsigned int *flags)
- 	}
- 
- 	if (!(*flags & MFD_NOEXEC_SEAL) && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) {
-		pr_err_ratelimited(
-+		pr_warn_once(
- 			"%s[%d]: memfd_create() requires MFD_NOEXEC_SEAL with vm.memfd_noexec=%d\n",
- 			current->comm, task_pid_nr(current), sysctl);
- 		return -EACCES;
@@ -0,0 +1,134 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+Date: Thu, 7 Sep 2023 16:02:30 +0300
+Subject: [PATCH] thunderbolt: Restart XDomain discovery handshake after
+ failure
+
+Alex reported that after rebooting the other host the peer-to-peer link
+does not come up anymore. The reason for this is that the host that was
+not rebooted tries to send the UUID request only 10 times according to
+the USB4 Inter-Domain spec and gives up if it does not get reply. Then
+when the other side is actually ready it cannot get the link established
+anymore. The USB4 Inter-Domain spec requires that the discovery protocol
+is restarted in that case so implement this now.
+
+Reported-by: Alex Balcanquall <alex@alexbal.com>
+Fixes: 8e1de7042596 ("thunderbolt: Add support for XDomain lane bonding")
+Cc: stable@vger.kernel.org
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/thunderbolt/xdomain.c | 58 +++++++++++++++++++++++++----------
+ 1 file changed, 41 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
+index 3c51e47dd86b..0b17a4d4e9b9 100644
+--- a/drivers/thunderbolt/xdomain.c
+++ b/drivers/thunderbolt/xdomain.c
+@@ -704,6 +704,27 @@ static void update_property_block(struct tb_xdomain *xd)
+ 	mutex_unlock(&xdomain_lock);
+ }
+ 
+static void start_handshake(struct tb_xdomain *xd)
+{
+	xd->state = XDOMAIN_STATE_INIT;
+	queue_delayed_work(xd->tb->wq, &xd->state_work,
+			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
+}
+
+/* Can be called from state_work */
+static void __stop_handshake(struct tb_xdomain *xd)
+{
+	cancel_delayed_work_sync(&xd->properties_changed_work);
+	xd->properties_changed_retries = 0;
+	xd->state_retries = 0;
+}
+
+static void stop_handshake(struct tb_xdomain *xd)
+{
+	cancel_delayed_work_sync(&xd->state_work);
+	__stop_handshake(xd);
+}
+
+ static void tb_xdp_handle_request(struct work_struct *work)
+ {
+ 	struct xdomain_request_work *xw = container_of(work, typeof(*xw), work);
+@@ -766,6 +787,15 @@ static void tb_xdp_handle_request(struct work_struct *work)
+ 	case UUID_REQUEST:
+ 		tb_dbg(tb, "%llx: received XDomain UUID request\n", route);
+ 		ret = tb_xdp_uuid_response(ctl, route, sequence, uuid);
+		/*
+		 * If we've stopped the discovery with an error such as
+		 * timing out, we will restart the handshake now that we
+		 * received UUID request from the remote host.
+		 */
+		if (!ret && xd && xd->state == XDOMAIN_STATE_ERROR) {
+			dev_dbg(&xd->dev, "restarting handshake\n");
+			start_handshake(xd);
+		}
+ 		break;
+ 
+ 	case LINK_STATE_STATUS_REQUEST:
+@@ -1522,6 +1552,13 @@ static void tb_xdomain_queue_properties_changed(struct tb_xdomain *xd)
+ 			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
+ }
+ 
+static void tb_xdomain_failed(struct tb_xdomain *xd)
+{
+	xd->state = XDOMAIN_STATE_ERROR;
+	queue_delayed_work(xd->tb->wq, &xd->state_work,
+			   msecs_to_jiffies(XDOMAIN_DEFAULT_TIMEOUT));
+}
+
+ static void tb_xdomain_state_work(struct work_struct *work)
+ {
+ 	struct tb_xdomain *xd = container_of(work, typeof(*xd), state_work.work);
+@@ -1548,7 +1585,7 @@ static void tb_xdomain_state_work(struct work_struct *work)
+ 		if (ret) {
+ 			if (ret == -EAGAIN)
+ 				goto retry_state;
+-			xd->state = XDOMAIN_STATE_ERROR;
+			tb_xdomain_failed(xd);
+ 		} else {
+ 			tb_xdomain_queue_properties_changed(xd);
+ 			if (xd->bonding_possible)
+@@ -1613,7 +1650,7 @@ static void tb_xdomain_state_work(struct work_struct *work)
+ 		if (ret) {
+ 			if (ret == -EAGAIN)
+ 				goto retry_state;
+-			xd->state = XDOMAIN_STATE_ERROR;
+			tb_xdomain_failed(xd);
+ 		} else {
+ 			xd->state = XDOMAIN_STATE_ENUMERATED;
+ 		}
+@@ -1624,6 +1661,8 @@ static void tb_xdomain_state_work(struct work_struct *work)
+ 		break;
+ 
+ 	case XDOMAIN_STATE_ERROR:
+		dev_dbg(&xd->dev, "discovery failed, stopping handshake\n");
+		__stop_handshake(xd);
+ 		break;
+ 
+ 	default:
+@@ -1793,21 +1832,6 @@ static void tb_xdomain_release(struct device *dev)
+ 	kfree(xd);
+ }
+ 
+-static void start_handshake(struct tb_xdomain *xd)
+-{
+-	xd->state = XDOMAIN_STATE_INIT;
+-	queue_delayed_work(xd->tb->wq, &xd->state_work,
+-			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
+-}
+-
+-static void stop_handshake(struct tb_xdomain *xd)
+-{
+-	cancel_delayed_work_sync(&xd->properties_changed_work);
+-	cancel_delayed_work_sync(&xd->state_work);
+-	xd->properties_changed_retries = 0;
+-	xd->state_retries = 0;
+-}
+-
+ static int __maybe_unused tb_xdomain_suspend(struct device *dev)
+ {
+ 	stop_handshake(tb_to_xdomain(dev));
@@ -1,146 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 27 Oct 2023 16:40:47 -0400
-Subject: [PATCH] drm/amd: Fix UBSAN array-index-out-of-bounds for Powerplay
- headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For pptable structs that use flexible array sizes, use flexible arrays.
-
-Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2039926
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
-Acked-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry-picked from commit 49afe91370b86566857a3c2c39612cf098110885)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- .../drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h |  4 ++--
- .../amd/pm/powerplay/hwmgr/vega10_pptable.h   | 24 +++++++++----------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
-index e0e40b054c08..5ec564dbf339 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
-+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
-@@ -367,7 +367,7 @@ typedef struct _ATOM_Tonga_VCE_State_Record {
- typedef struct _ATOM_Tonga_VCE_State_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;
-	ATOM_Tonga_VCE_State_Record entries[1];
-+	ATOM_Tonga_VCE_State_Record entries[];
- } ATOM_Tonga_VCE_State_Table;
- 
- typedef struct _ATOM_Tonga_PowerTune_Table {
-@@ -482,7 +482,7 @@ typedef struct _ATOM_Tonga_Hard_Limit_Record {
- typedef struct _ATOM_Tonga_Hard_Limit_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;
-	ATOM_Tonga_Hard_Limit_Record entries[1];
-+	ATOM_Tonga_Hard_Limit_Record entries[];
- } ATOM_Tonga_Hard_Limit_Table;
- 
- typedef struct _ATOM_Tonga_GPIO_Table {
-diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
-index 9c479bd9a786..a372abcd01be 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
-+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
-@@ -129,7 +129,7 @@ typedef struct _ATOM_Vega10_State {
- typedef struct _ATOM_Vega10_State_Array {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                         /* Number of entries. */
-	ATOM_Vega10_State states[1];                             /* Dynamically allocate entries. */
-+	ATOM_Vega10_State states[];                             /* Dynamically allocate entries. */
- } ATOM_Vega10_State_Array;
- 
- typedef struct _ATOM_Vega10_CLK_Dependency_Record {
-@@ -169,37 +169,37 @@ typedef struct _ATOM_Vega10_GFXCLK_Dependency_Table {
- typedef struct _ATOM_Vega10_MCLK_Dependency_Table {
-     UCHAR ucRevId;
-     UCHAR ucNumEntries;                                         /* Number of entries. */
-    ATOM_Vega10_MCLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+    ATOM_Vega10_MCLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_MCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_SOCCLK_Dependency_Table {
-     UCHAR ucRevId;
-     UCHAR ucNumEntries;                                         /* Number of entries. */
-    ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+    ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_SOCCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_DCEFCLK_Dependency_Table {
-     UCHAR ucRevId;
-     UCHAR ucNumEntries;                                         /* Number of entries. */
-    ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+    ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_DCEFCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_PIXCLK_Dependency_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                         /* Number of entries. */
-	ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+	ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_PIXCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_DISPCLK_Dependency_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                         /* Number of entries.*/
-	ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+	ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_DISPCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_PHYCLK_Dependency_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                         /* Number of entries. */
-	ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically allocate entries. */
-+	ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically allocate entries. */
- } ATOM_Vega10_PHYCLK_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_MM_Dependency_Record {
-@@ -213,7 +213,7 @@ typedef struct _ATOM_Vega10_MM_Dependency_Record {
- typedef struct _ATOM_Vega10_MM_Dependency_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                         /* Number of entries */
-	ATOM_Vega10_MM_Dependency_Record entries[1];             /* Dynamically allocate entries */
-+	ATOM_Vega10_MM_Dependency_Record entries[];             /* Dynamically allocate entries */
- } ATOM_Vega10_MM_Dependency_Table;
- 
- typedef struct _ATOM_Vega10_PCIE_Record {
-@@ -225,7 +225,7 @@ typedef struct _ATOM_Vega10_PCIE_Record {
- typedef struct _ATOM_Vega10_PCIE_Table {
- 	UCHAR  ucRevId;
- 	UCHAR  ucNumEntries;                                        /* Number of entries */
-	ATOM_Vega10_PCIE_Record entries[1];                      /* Dynamically allocate entries. */
-+	ATOM_Vega10_PCIE_Record entries[];                      /* Dynamically allocate entries. */
- } ATOM_Vega10_PCIE_Table;
- 
- typedef struct _ATOM_Vega10_Voltage_Lookup_Record {
-@@ -235,7 +235,7 @@ typedef struct _ATOM_Vega10_Voltage_Lookup_Record {
- typedef struct _ATOM_Vega10_Voltage_Lookup_Table {
- 	UCHAR ucRevId;
- 	UCHAR ucNumEntries;                                          /* Number of entries */
-	ATOM_Vega10_Voltage_Lookup_Record entries[1];             /* Dynamically allocate entries */
-+	ATOM_Vega10_Voltage_Lookup_Record entries[];             /* Dynamically allocate entries */
- } ATOM_Vega10_Voltage_Lookup_Table;
- 
- typedef struct _ATOM_Vega10_Fan_Table {
-@@ -329,7 +329,7 @@ typedef struct _ATOM_Vega10_VCE_State_Table
- {
-     UCHAR ucRevId;
-     UCHAR ucNumEntries;
-    ATOM_Vega10_VCE_State_Record entries[1];
-+    ATOM_Vega10_VCE_State_Record entries[];
- } ATOM_Vega10_VCE_State_Table;
- 
- typedef struct _ATOM_Vega10_PowerTune_Table {
-@@ -432,7 +432,7 @@ typedef struct _ATOM_Vega10_Hard_Limit_Table
- {
-     UCHAR ucRevId;
-     UCHAR ucNumEntries;
-    ATOM_Vega10_Hard_Limit_Record entries[1];
-+    ATOM_Vega10_Hard_Limit_Record entries[];
- } ATOM_Vega10_Hard_Limit_Table;
- 
- typedef struct _Vega10_PPTable_Generic_SubTable_Header
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Borislav Petkov (AMD)" <bp@alien8.de>
+Date: Sat, 7 Oct 2023 12:57:02 +0200
+Subject: [PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix erratum #1485 on Zen4 parts where running with STIBP disabled can
+cause an #UD exception. The performance impact of the fix is negligible.
+
+Reported-by: René Rebe <rene@exactcode.de>
+Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
+Tested-by: René Rebe <rene@exactcode.de>
+Cc: <stable@kernel.org>
+Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/include/asm/msr-index.h | 9 +++++++--
+ arch/x86/kernel/cpu/amd.c        | 8 ++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
+index ebbf80d8b8bd..a79b10e57757 100644
+--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
+@@ -630,12 +630,17 @@
+ /* AMD Last Branch Record MSRs */
+ #define MSR_AMD64_LBR_SELECT			0xc000010e
+ 
+-/* Fam 17h MSRs */
+-#define MSR_F17H_IRPERF			0xc00000e9
+/* Zen4 */
+#define MSR_ZEN4_BP_CFG			0xc001102e
+#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5
+ 
+/* Zen 2 */
+ #define MSR_ZEN2_SPECTRAL_CHICKEN	0xc00110e3
+ #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT	BIT_ULL(1)
+ 
+/* Fam 17h MSRs */
+#define MSR_F17H_IRPERF			0xc00000e9
+
+ /* Fam 16h MSRs */
+ #define MSR_F16H_L2I_PERF_CTL		0xc0010230
+ #define MSR_F16H_L2I_PERF_CTR		0xc0010231
+diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
+index a608a2b78073..154e9c0c16bd 100644
+--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
+@@ -80,6 +80,10 @@ static const int amd_div0[] =
+ 	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
+ 			   AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
+ 
+static const int amd_erratum_1485[] =
+	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf),
+			   AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf));
+
+ static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
+ {
+ 	int osvw_id = *erratum++;
+@@ -1125,6 +1129,10 @@ static void init_amd(struct cpuinfo_x86 *c)
+ 		pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n");
+ 		setup_force_cpu_bug(X86_BUG_DIV0);
+ 	}
+
+	if (!cpu_has(c, X86_FEATURE_HYPERVISOR) &&
+	     cpu_has_amd_erratum(c, amd_erratum_1485))
+		msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
+ }
+ 
+ #ifdef CONFIG_X86_32
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Sterz <s.sterz@proxmox.com>
+Date: Wed, 18 Oct 2023 10:45:45 +0200
+Subject: [PATCH] Revert "nSVM: Check for reserved encodings of TLB_CONTROL in
+ nested VMCB"
+
+This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1.
+
+Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
+---
+ arch/x86/kvm/svm/nested.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
+index add65dd59756..61a6c0235519 100644
+--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
+@@ -242,18 +242,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)
+ 	    kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1);
+ }
+ 
+-static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl)
+-{
+-	/* Nested FLUSHBYASID is not supported yet.  */
+-	switch(tlb_ctl) {
+-		case TLB_CONTROL_DO_NOTHING:
+-		case TLB_CONTROL_FLUSH_ALL_ASID:
+-			return true;
+-		default:
+-			return false;
+-	}
+-}
+-
+ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
+ 					 struct vmcb_ctrl_area_cached *control)
+ {
+@@ -273,9 +261,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
+ 					   IOPM_SIZE)))
+ 		return false;
+ 
+-	if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl)))
+-		return false;
+-
+ 	return true;
+ }
+ 
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Date: Fri, 15 Dec 2023 16:49:50 +0530
-Subject: [PATCH] ext4: fallback to complex scan if aligned scan doesn't work
-
-Currently in case the goal length is a multiple of stripe size we use
-ext4_mb_scan_aligned() to find the stripe size aligned physical blocks.
-In case we are not able to find any, we again go back to calling
-ext4_mb_choose_next_group() to search for a different suitable block
-group. However, since the linear search always begins from the start,
-most of the times we end up with the same BG and the cycle continues.
-
-With large fliesystems, the CPU can be stuck in this loop for hours
-which can slow down the whole system. Hence, until we figure out a
-better way to continue the search (rather than starting from beginning)
-in ext4_mb_choose_next_group(), lets just fallback to
-ext4_mb_complex_scan_group() in case aligned scan fails, as it is much
-more likely to find the needed blocks.
-
-Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
---
- fs/ext4/mballoc.c | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 2690d47a9ea2..9ff8ea02f79d 100644
--- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -2894,14 +2894,19 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
- 			ac->ac_groups_scanned++;
- 			if (cr == CR_POWER2_ALIGNED)
- 				ext4_mb_simple_scan_group(ac, &e4b);
-			else if ((cr == CR_GOAL_LEN_FAST ||
-				 cr == CR_BEST_AVAIL_LEN) &&
-				 sbi->s_stripe &&
-				 !(ac->ac_g_ex.fe_len %
-				 EXT4_B2C(sbi, sbi->s_stripe)))
-				ext4_mb_scan_aligned(ac, &e4b);
-			else
-				ext4_mb_complex_scan_group(ac, &e4b);
-+			else {
-+				bool is_stripe_aligned = sbi->s_stripe &&
-+					!(ac->ac_g_ex.fe_len %
-+					  EXT4_B2C(sbi, sbi->s_stripe));
-+
-+				if ((cr == CR_GOAL_LEN_FAST ||
-+				     cr == CR_BEST_AVAIL_LEN) &&
-+				    is_stripe_aligned)
-+					ext4_mb_scan_aligned(ac, &e4b);
-+
-+				if (ac->ac_status == AC_STATUS_CONTINUE)
-+					ext4_mb_complex_scan_group(ac, &e4b);
-+			}
- 
- 			ext4_unlock_group(sb, group);
- 			ext4_mb_unload_buddy(&e4b);
@@ -18,16 +18,15 @@ Reported-by: Stefan Sterz <s.sterz@proxmox.com>
 Closes: https://lkml.kernel.org/r/b9915c9c-4cf6-051a-2d91-44cc6380f455%40proxmox.com
 Signed-off-by: Sean Christopherson <seanjc@google.com>
 Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 arch/x86/kvm/svm/svm.c | 1 +
 1 file changed, 1 insertion(+)

 diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
-index 99832814341c..e8bb2bfd1ba1 100644
+index cf31babfbbb9..99a7e93b2edf 100644
 --- a/arch/x86/kvm/svm/svm.c
 +++ b/arch/x86/kvm/svm/svm.c
-@@ -4985,6 +4985,7 @@ static __init void svm_set_cpu_caps(void)
+@@ -4920,6 +4920,7 @@ static __init void svm_set_cpu_caps(void)
 	if (nested) {
 		kvm_cpu_cap_set(X86_FEATURE_SVM);
 		kvm_cpu_cap_set(X86_FEATURE_VMCBCLEAN);
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stoiko Ivanov <s.ivanov@proxmox.com>
-Date: Wed, 3 Apr 2024 10:29:59 +0200
-Subject: [PATCH] Revert "cifs: fix flushing folio regression for 6.1 backport"
-
-This reverts commit 2dc07a11e269bfbe5589e99b60cdbae0118be979.
---
- fs/smb/client/cifsfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
-index 55a6d0296ec82..82313b2534631 100644
--- a/fs/smb/client/cifsfs.c
-+++ b/fs/smb/client/cifsfs.c
-@@ -1245,7 +1245,7 @@ static int cifs_flush_folio(struct inode *inode, loff_t pos, loff_t *_fstart, lo
- 	int rc = 0;
- 
- 	folio = filemap_get_folio(inode->i_mapping, index);
-	if (!folio)
-+	if (IS_ERR(folio))
- 		return 0;
- 
- 	size = folio_size(folio);
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stoiko Ivanov <s.ivanov@proxmox.com>
-Date: Thu, 4 Apr 2024 11:41:15 +0200
-Subject: [PATCH] Revert "thermal: trip: Drop lockdep assertion from
- thermal_zone_trip_id()"
-
-This reverts commit c723c4fca6d2db3815623ff4dc0ea51667b56b89.
---
- drivers/thermal/thermal_trip.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
-index 68bea8706c597..1d4fe63e09f77 100644
--- a/drivers/thermal/thermal_trip.c
-+++ b/drivers/thermal/thermal_trip.c
-@@ -201,6 +201,8 @@ int thermal_zone_trip_id(struct thermal_zone_device *tz,
- {
- 	int i;
- 
-+	lockdep_assert_held(&tz->lock);
-+
- 	for (i = 0; i < tz->num_trips; i++) {
- 		if (&tz->trips[i] == trip)
- 			return i;
@@ -1,343 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stoiko Ivanov <s.ivanov@proxmox.com>
-Date: Thu, 4 Apr 2024 11:41:17 +0200
-Subject: [PATCH] Revert "thermal: core: Store trip pointer in struct
- thermal_instance"
-
-This reverts commit 643b451957369f28b7770af387d14d4e4712074b.
---
- drivers/thermal/gov_bang_bang.c       | 23 +++++++++++++++--------
- drivers/thermal/gov_fair_share.c      |  5 ++---
- drivers/thermal/gov_power_allocator.c | 11 +++--------
- drivers/thermal/gov_step_wise.c       | 16 +++++++++-------
- drivers/thermal/thermal_core.c        | 15 +++++----------
- drivers/thermal/thermal_core.h        |  4 +---
- drivers/thermal/thermal_helpers.c     |  5 +----
- drivers/thermal/thermal_sysfs.c       |  3 +--
- drivers/thermal/thermal_trip.c        | 15 ---------------
- 9 files changed, 37 insertions(+), 60 deletions(-)
-
-diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
-index 49cdfaa3a9279..1b121066521ff 100644
--- a/drivers/thermal/gov_bang_bang.c
-+++ b/drivers/thermal/gov_bang_bang.c
-@@ -13,21 +13,28 @@
- 
- #include "thermal_core.h"
- 
-static int thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_index)
-+static int thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id)
- {
-	const struct thermal_trip *trip = &tz->trips[trip_index];
-+	struct thermal_trip trip;
- 	struct thermal_instance *instance;
-+	int ret;
-+
-+	ret = __thermal_zone_get_trip(tz, trip_id, &trip);
-+	if (ret) {
-+		pr_warn_once("Failed to retrieve trip point %d\n", trip_id);
-+		return ret;
-+	}
- 
-	if (!trip->hysteresis)
-+	if (!trip.hysteresis)
- 		dev_info_once(&tz->device,
- 			      "Zero hysteresis value for thermal zone %s\n", tz->type);
- 
- 	dev_dbg(&tz->device, "Trip%d[temp=%d]:temp=%d:hyst=%d\n",
-				trip_index, trip->temperature, tz->temperature,
-				trip->hysteresis);
-+				trip_id, trip.temperature, tz->temperature,
-+				trip.hysteresis);
- 
- 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
-		if (instance->trip != trip)
-+		if (instance->trip != trip_id)
- 			continue;
- 
- 		/* in case fan is in initial state, switch the fan off */
-@@ -45,10 +52,10 @@ static int thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_ind
- 		 * enable fan when temperature exceeds trip_temp and disable
- 		 * the fan in case it falls below trip_temp minus hysteresis
- 		 */
-		if (instance->target == 0 && tz->temperature >= trip->temperature)
-+		if (instance->target == 0 && tz->temperature >= trip.temperature)
- 			instance->target = 1;
- 		else if (instance->target == 1 &&
-			 tz->temperature <= trip->temperature - trip->hysteresis)
-+			 tz->temperature <= trip.temperature - trip.hysteresis)
- 			instance->target = 0;
- 
- 		dev_dbg(&instance->cdev->device, "target=%d\n",
-diff --git a/drivers/thermal/gov_fair_share.c b/drivers/thermal/gov_fair_share.c
-index 2abeb8979f500..03c2daeb6ee8b 100644
--- a/drivers/thermal/gov_fair_share.c
-+++ b/drivers/thermal/gov_fair_share.c
-@@ -49,7 +49,7 @@ static long get_target_state(struct thermal_zone_device *tz,
- /**
-  * fair_share_throttle - throttles devices associated with the given zone
-  * @tz: thermal_zone_device
- * @trip_index: trip point index
-+ * @trip: trip point index
-  *
-  * Throttling Logic: This uses three parameters to calculate the new
-  * throttle state of the cooling devices associated with the given zone.
-@@ -65,9 +65,8 @@ static long get_target_state(struct thermal_zone_device *tz,
-  *	(Heavily assumes the trip points are in ascending order)
-  * new_state of cooling device = P3 * P2 * P1
-  */
-static int fair_share_throttle(struct thermal_zone_device *tz, int trip_index)
-+static int fair_share_throttle(struct thermal_zone_device *tz, int trip)
- {
-	const struct thermal_trip *trip = &tz->trips[trip_index];
- 	struct thermal_instance *instance;
- 	int total_weight = 0;
- 	int total_instance = 0;
-diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
-index fc969642f70b7..fb311339bd08f 100644
--- a/drivers/thermal/gov_power_allocator.c
-+++ b/drivers/thermal/gov_power_allocator.c
-@@ -90,14 +90,12 @@ static u32 estimate_sustainable_power(struct thermal_zone_device *tz)
- 	u32 sustainable_power = 0;
- 	struct thermal_instance *instance;
- 	struct power_allocator_params *params = tz->governor_data;
-	const struct thermal_trip *trip_max_desired_temperature =
-			&tz->trips[params->trip_max_desired_temperature];
- 
- 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
- 		struct thermal_cooling_device *cdev = instance->cdev;
- 		u32 min_power;
- 
-		if (instance->trip != trip_max_desired_temperature)
-+		if (instance->trip != params->trip_max_desired_temperature)
- 			continue;
- 
- 		if (!cdev_is_power_actor(cdev))
-@@ -385,13 +383,12 @@ static int allocate_power(struct thermal_zone_device *tz,
- {
- 	struct thermal_instance *instance;
- 	struct power_allocator_params *params = tz->governor_data;
-	const struct thermal_trip *trip_max_desired_temperature =
-			&tz->trips[params->trip_max_desired_temperature];
- 	u32 *req_power, *max_power, *granted_power, *extra_actor_power;
- 	u32 *weighted_req_power;
- 	u32 total_req_power, max_allocatable_power, total_weighted_req_power;
- 	u32 total_granted_power, power_range;
- 	int i, num_actors, total_weight, ret = 0;
-+	int trip_max_desired_temperature = params->trip_max_desired_temperature;
- 
- 	num_actors = 0;
- 	total_weight = 0;
-@@ -567,14 +564,12 @@ static void allow_maximum_power(struct thermal_zone_device *tz, bool update)
- {
- 	struct thermal_instance *instance;
- 	struct power_allocator_params *params = tz->governor_data;
-	const struct thermal_trip *trip_max_desired_temperature =
-			&tz->trips[params->trip_max_desired_temperature];
- 	u32 req_power;
- 
- 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
- 		struct thermal_cooling_device *cdev = instance->cdev;
- 
-		if ((instance->trip != trip_max_desired_temperature) ||
-+		if ((instance->trip != params->trip_max_desired_temperature) ||
- 		    (!cdev_is_power_actor(instance->cdev)))
- 			continue;
- 
-diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
-index 849dc1ec8d27c..1050fb4d94c2d 100644
--- a/drivers/thermal/gov_step_wise.c
-+++ b/drivers/thermal/gov_step_wise.c
-@@ -81,24 +81,26 @@ static void update_passive_instance(struct thermal_zone_device *tz,
- 
- static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id)
- {
-	const struct thermal_trip *trip = &tz->trips[trip_id];
- 	enum thermal_trend trend;
- 	struct thermal_instance *instance;
-+	struct thermal_trip trip;
- 	bool throttle = false;
- 	int old_target;
- 
-+	__thermal_zone_get_trip(tz, trip_id, &trip);
-+
- 	trend = get_tz_trend(tz, trip_id);
- 
-	if (tz->temperature >= trip->temperature) {
-+	if (tz->temperature >= trip.temperature) {
- 		throttle = true;
-		trace_thermal_zone_trip(tz, trip_id, trip->type);
-+		trace_thermal_zone_trip(tz, trip_id, trip.type);
- 	}
- 
- 	dev_dbg(&tz->device, "Trip%d[type=%d,temp=%d]:trend=%d,throttle=%d\n",
-		trip_id, trip->type, trip->temperature, trend, throttle);
-+				trip_id, trip.type, trip.temperature, trend, throttle);
- 
- 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
-		if (instance->trip != trip)
-+		if (instance->trip != trip_id)
- 			continue;
- 
- 		old_target = instance->target;
-@@ -112,11 +114,11 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip_id
- 		/* Activate a passive thermal instance */
- 		if (old_target == THERMAL_NO_TARGET &&
- 			instance->target != THERMAL_NO_TARGET)
-			update_passive_instance(tz, trip->type, 1);
-+			update_passive_instance(tz, trip.type, 1);
- 		/* Deactivate a passive thermal instance */
- 		else if (old_target != THERMAL_NO_TARGET &&
- 			instance->target == THERMAL_NO_TARGET)
-			update_passive_instance(tz, trip->type, -1);
-+			update_passive_instance(tz, trip.type, -1);
- 
- 		instance->initialized = true;
- 		mutex_lock(&instance->cdev->lock);
-diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
-index c066c09555667..69cff5fc32156 100644
--- a/drivers/thermal/thermal_core.c
-+++ b/drivers/thermal/thermal_core.c
-@@ -582,7 +582,7 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)
- /**
-  * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
-  * @tz:		pointer to struct thermal_zone_device
- * @trip_index:	indicates which trip point the cooling devices is
-+ * @trip:	indicates which trip point the cooling devices is
-  *		associated with in this thermal zone.
-  * @cdev:	pointer to struct thermal_cooling_device
-  * @upper:	the Maximum cooling state for this trip point.
-@@ -602,7 +602,7 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)
-  * Return: 0 on success, the proper error value otherwise.
-  */
- int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
-				     int trip_index,
-+				     int trip,
- 				     struct thermal_cooling_device *cdev,
- 				     unsigned long upper, unsigned long lower,
- 				     unsigned int weight)
-@@ -611,15 +611,12 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
- 	struct thermal_instance *pos;
- 	struct thermal_zone_device *pos1;
- 	struct thermal_cooling_device *pos2;
-	const struct thermal_trip *trip;
- 	bool upper_no_limit;
- 	int result;
- 
-	if (trip_index >= tz->num_trips || trip_index < 0)
-+	if (trip >= tz->num_trips || trip < 0)
- 		return -EINVAL;
- 
-	trip = &tz->trips[trip_index];
-
- 	list_for_each_entry(pos1, &thermal_tz_list, node) {
- 		if (pos1 == tz)
- 			break;
-@@ -724,7 +721,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device);
-  * thermal_zone_unbind_cooling_device() - unbind a cooling device from a
-  *					  thermal zone.
-  * @tz:		pointer to a struct thermal_zone_device.
- * @trip_index:	indicates which trip point the cooling devices is
-+ * @trip:	indicates which trip point the cooling devices is
-  *		associated with in this thermal zone.
-  * @cdev:	pointer to a struct thermal_cooling_device.
-  *
-@@ -735,15 +732,13 @@ EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device);
-  * Return: 0 on success, the proper error value otherwise.
-  */
- int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
-				       int trip_index,
-+				       int trip,
- 				       struct thermal_cooling_device *cdev)
- {
- 	struct thermal_instance *pos, *next;
-	const struct thermal_trip *trip;
- 
- 	mutex_lock(&tz->lock);
- 	mutex_lock(&cdev->lock);
-	trip = &tz->trips[trip_index];
- 	list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) {
- 		if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
- 			list_del(&pos->tz_node);
-diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
-index a33b389bbcfe8..17c1bbed734d3 100644
--- a/drivers/thermal/thermal_core.h
-+++ b/drivers/thermal/thermal_core.h
-@@ -91,7 +91,7 @@ struct thermal_instance {
- 	char name[THERMAL_NAME_LENGTH];
- 	struct thermal_zone_device *tz;
- 	struct thermal_cooling_device *cdev;
-	const struct thermal_trip *trip;
-+	int trip;
- 	bool initialized;
- 	unsigned long upper;	/* Highest cooling state for this trip point */
- 	unsigned long lower;	/* Lowest cooling state for this trip point */
-@@ -123,8 +123,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
- void __thermal_zone_set_trips(struct thermal_zone_device *tz);
- int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
- 			    struct thermal_trip *trip);
-int thermal_zone_trip_id(struct thermal_zone_device *tz,
-			 const struct thermal_trip *trip);
- int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
- 
- /* sysfs I/F */
-diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
-index 421ed301541e1..cfba0965a22da 100644
--- a/drivers/thermal/thermal_helpers.c
-+++ b/drivers/thermal/thermal_helpers.c
-@@ -41,17 +41,14 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip)
- 
- struct thermal_instance *
- get_thermal_instance(struct thermal_zone_device *tz,
-		     struct thermal_cooling_device *cdev, int trip_index)
-+		     struct thermal_cooling_device *cdev, int trip)
- {
- 	struct thermal_instance *pos = NULL;
- 	struct thermal_instance *target_instance = NULL;
-	const struct thermal_trip *trip;
- 
- 	mutex_lock(&tz->lock);
- 	mutex_lock(&cdev->lock);
- 
-	trip = &tz->trips[trip_index];
-
- 	list_for_each_entry(pos, &tz->thermal_instances, tz_node) {
- 		if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
- 			target_instance = pos;
-diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
-index eef40d4f30639..4e6a97db894e9 100644
--- a/drivers/thermal/thermal_sysfs.c
-+++ b/drivers/thermal/thermal_sysfs.c
-@@ -943,8 +943,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf)
- 	instance =
- 	    container_of(attr, struct thermal_instance, attr);
- 
-	return sprintf(buf, "%d\n",
-		       thermal_zone_trip_id(instance->tz, instance->trip));
-+	return sprintf(buf, "%d\n", instance->trip);
- }
- 
- ssize_t
-diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
-index 1d4fe63e09f77..21736e02fa360 100644
--- a/drivers/thermal/thermal_trip.c
-+++ b/drivers/thermal/thermal_trip.c
-@@ -195,18 +195,3 @@ int thermal_zone_set_trip(struct thermal_zone_device *tz, int trip_id,
- 
- 	return 0;
- }
-
-int thermal_zone_trip_id(struct thermal_zone_device *tz,
-			 const struct thermal_trip *trip)
-{
-	int i;
-
-	lockdep_assert_held(&tz->lock);
-
-	for (i = 0; i < tz->num_trips; i++) {
-		if (&tz->trips[i] == trip)
-			return i;
-	}
-
-	return -ENODATA;
-}
@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sean Christopherson <seanjc@google.com>
+Date: Wed, 27 Sep 2023 17:19:52 -0700
+Subject: [PATCH] x86/fpu: Allow caller to constrain xfeatures when copying to
+ uabi buffer
+
+Plumb an xfeatures mask into __copy_xstate_to_uabi_buf() so that KVM can
+constrain which xfeatures are saved into the userspace buffer without
+having to modify the user_xfeatures field in KVM's guest_fpu state.
+
+KVM's ABI for KVM_GET_XSAVE{2} is that features that are not exposed to
+guest must not show up in the effective xstate_bv field of the buffer.
+Saving only the guest-supported xfeatures allows userspace to load the
+saved state on a different host with a fewer xfeatures, so long as the
+target host supports the xfeatures that are exposed to the guest.
+
+KVM currently sets user_xfeatures directly to restrict KVM_GET_XSAVE{2} to
+the set of guest-supported xfeatures, but doing so broke KVM's historical
+ABI for KVM_SET_XSAVE, which allows userspace to load any xfeatures that
+are supported by the *host*.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Sean Christopherson <seanjc@google.com>
+Message-Id: <20230928001956.924301-2-seanjc@google.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit 18164f66e6c59fda15c198b371fa008431efdb22)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/include/asm/fpu/api.h |  3 ++-
+ arch/x86/kernel/fpu/core.c     |  5 +++--
+ arch/x86/kernel/fpu/xstate.c   |  7 +++++--
+ arch/x86/kernel/fpu/xstate.h   |  3 ++-
+ arch/x86/kvm/x86.c             | 21 +++++++++------------
+ 5 files changed, 21 insertions(+), 18 deletions(-)
+
+diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h
+index b475d9a582b8..e829fa4c6788 100644
+--- a/arch/x86/include/asm/fpu/api.h
+++ b/arch/x86/include/asm/fpu/api.h
+@@ -148,7 +148,8 @@ static inline void fpu_update_guest_xfd(struct fpu_guest *guest_fpu, u64 xfd) {
+ static inline void fpu_sync_guest_vmexit_xfd_state(void) { }
+ #endif
+ 
+-extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf, unsigned int size, u32 pkru);
+extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,
+					   unsigned int size, u64 xfeatures, u32 pkru);
+ extern int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gfpu, const void *buf, u64 xcr0, u32 *vpkru);
+ 
+ static inline void fpstate_set_confidential(struct fpu_guest *gfpu)
+diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
+index a083f9ac9e4f..1d190761d00f 100644
+--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
+@@ -369,14 +369,15 @@ int fpu_swap_kvm_fpstate(struct fpu_guest *guest_fpu, bool enter_guest)
+ EXPORT_SYMBOL_GPL(fpu_swap_kvm_fpstate);
+ 
+ void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,
+-				    unsigned int size, u32 pkru)
+				    unsigned int size, u64 xfeatures, u32 pkru)
+ {
+ 	struct fpstate *kstate = gfpu->fpstate;
+ 	union fpregs_state *ustate = buf;
+ 	struct membuf mb = { .p = buf, .left = size };
+ 
+ 	if (cpu_feature_enabled(X86_FEATURE_XSAVE)) {
+-		__copy_xstate_to_uabi_buf(mb, kstate, pkru, XSTATE_COPY_XSAVE);
+		__copy_xstate_to_uabi_buf(mb, kstate, xfeatures, pkru,
+					  XSTATE_COPY_XSAVE);
+ 	} else {
+ 		memcpy(&ustate->fxsave, &kstate->regs.fxsave,
+ 		       sizeof(ustate->fxsave));
+diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
+index 1afbc4866b10..463ec0cd0dab 100644
+--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
+@@ -1053,6 +1053,7 @@ static void copy_feature(bool from_xstate, struct membuf *to, void *xstate,
+  * __copy_xstate_to_uabi_buf - Copy kernel saved xstate to a UABI buffer
+  * @to:		membuf descriptor
+  * @fpstate:	The fpstate buffer from which to copy
+ * @xfeatures:	The mask of xfeatures to save (XSAVE mode only)
+  * @pkru_val:	The PKRU value to store in the PKRU component
+  * @copy_mode:	The requested copy mode
+  *
+@@ -1063,7 +1064,8 @@ static void copy_feature(bool from_xstate, struct membuf *to, void *xstate,
+  * It supports partial copy but @to.pos always starts from zero.
+  */
+ void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
+-			       u32 pkru_val, enum xstate_copy_mode copy_mode)
+			       u64 xfeatures, u32 pkru_val,
+			       enum xstate_copy_mode copy_mode)
+ {
+ 	const unsigned int off_mxcsr = offsetof(struct fxregs_state, mxcsr);
+ 	struct xregs_state *xinit = &init_fpstate.regs.xsave;
+@@ -1087,7 +1089,7 @@ void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
+ 		break;
+ 
+ 	case XSTATE_COPY_XSAVE:
+-		header.xfeatures &= fpstate->user_xfeatures;
+		header.xfeatures &= fpstate->user_xfeatures & xfeatures;
+ 		break;
+ 	}
+ 
+@@ -1189,6 +1191,7 @@ void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,
+ 			     enum xstate_copy_mode copy_mode)
+ {
+ 	__copy_xstate_to_uabi_buf(to, tsk->thread.fpu.fpstate,
+				  tsk->thread.fpu.fpstate->user_xfeatures,
+ 				  tsk->thread.pkru, copy_mode);
+ }
+ 
+diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h
+index a4ecb04d8d64..3518fb26d06b 100644
+--- a/arch/x86/kernel/fpu/xstate.h
+++ b/arch/x86/kernel/fpu/xstate.h
+@@ -43,7 +43,8 @@ enum xstate_copy_mode {
+ 
+ struct membuf;
+ extern void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
+-				      u32 pkru_val, enum xstate_copy_mode copy_mode);
+				      u64 xfeatures, u32 pkru_val,
+				      enum xstate_copy_mode copy_mode);
+ extern void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,
+ 				    enum xstate_copy_mode mode);
+ extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf, u32 *pkru);
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index ff92ff41d5ce..a43a950d04cb 100644
+--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
+@@ -5314,26 +5314,23 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
+ 	return 0;
+ }
+ 
+-static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
+-					 struct kvm_xsave *guest_xsave)
+
+static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
+					  u8 *state, unsigned int size)
+ {
+ 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
+ 		return;
+ 
+-	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu,
+-				       guest_xsave->region,
+-				       sizeof(guest_xsave->region),
+	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu, state, size,
+				       vcpu->arch.guest_fpu.fpstate->user_xfeatures,
+ 				       vcpu->arch.pkru);
+ }
+ 
+-static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
+-					  u8 *state, unsigned int size)
+static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
+					 struct kvm_xsave *guest_xsave)
+ {
+-	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
+-		return;
+-
+-	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu,
+-				       state, size, vcpu->arch.pkru);
+	return kvm_vcpu_ioctl_x86_get_xsave2(vcpu, (void *)guest_xsave->region,
+					     sizeof(guest_xsave->region));
+ }
+ 
+ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
@@ -0,0 +1,119 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sean Christopherson <seanjc@google.com>
+Date: Wed, 27 Sep 2023 17:19:53 -0700
+Subject: [PATCH] KVM: x86: Constrain guest-supported xfeatures only at
+ KVM_GET_XSAVE{2}
+
+Mask off xfeatures that aren't exposed to the guest only when saving guest
+state via KVM_GET_XSAVE{2} instead of modifying user_xfeatures directly.
+Preserving the maximal set of xfeatures in user_xfeatures restores KVM's
+ABI for KVM_SET_XSAVE, which prior to commit ad856280ddea ("x86/kvm/fpu:
+Limit guest user_xfeatures to supported bits of XCR0") allowed userspace
+to load xfeatures that are supported by the host, irrespective of what
+xfeatures are exposed to the guest.
+
+There is no known use case where userspace *intentionally* loads xfeatures
+that aren't exposed to the guest, but the bug fixed by commit ad856280ddea
+was specifically that KVM_GET_SAVE{2} would save xfeatures that weren't
+exposed to the guest, e.g. would lead to userspace unintentionally loading
+guest-unsupported xfeatures when live migrating a VM.
+
+Restricting KVM_SET_XSAVE to guest-supported xfeatures is especially
+problematic for QEMU-based setups, as QEMU has a bug where instead of
+terminating the VM if KVM_SET_XSAVE fails, QEMU instead simply stops
+loading guest state, i.e. resumes the guest after live migration with
+incomplete guest state, and ultimately results in guest data corruption.
+
+Note, letting userspace restore all host-supported xfeatures does not fix
+setups where a VM is migrated from a host *without* commit ad856280ddea,
+to a target with a subset of host-supported xfeatures.  However there is
+no way to safely address that scenario, e.g. KVM could silently drop the
+unsupported features, but that would be a clear violation of KVM's ABI and
+so would require userspace to opt-in, at which point userspace could
+simply be updated to sanitize the to-be-loaded XSAVE state.
+
+Reported-by: Tyler Stachecki <stachecki.tyler@gmail.com>
+Closes: https://lore.kernel.org/all/20230914010003.358162-1-tstachecki@bloomberg.net
+Fixes: ad856280ddea ("x86/kvm/fpu: Limit guest user_xfeatures to supported bits of XCR0")
+Cc: stable@vger.kernel.org
+Cc: Leonardo Bras <leobras@redhat.com>
+Signed-off-by: Sean Christopherson <seanjc@google.com>
+Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
+Message-Id: <20230928001956.924301-3-seanjc@google.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit 8647c52e9504c99752a39f1d44f6268f82c40a5c)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/kernel/fpu/xstate.c |  5 +----
+ arch/x86/kvm/cpuid.c         |  8 --------
+ arch/x86/kvm/x86.c           | 18 ++++++++++++++++--
+ 3 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
+index 463ec0cd0dab..ebe698f8af73 100644
+--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
+@@ -1543,10 +1543,7 @@ static int fpstate_realloc(u64 xfeatures, unsigned int ksize,
+ 		fpregs_restore_userregs();
+ 
+ 	newfps->xfeatures = curfps->xfeatures | xfeatures;
+-
+-	if (!guest_fpu)
+-		newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
+-
+	newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
+ 	newfps->xfd = curfps->xfd & ~xfeatures;
+ 
+ 	/* Do the final updates within the locked region */
+diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
+index 61aefeb3fdbc..e5393ee652ba 100644
+--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
+@@ -350,14 +350,6 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
+ 	vcpu->arch.guest_supported_xcr0 =
+ 		cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);
+ 
+-	/*
+-	 * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if
+-	 * XSAVE/XCRO are not exposed to the guest, and even if XSAVE isn't
+-	 * supported by the host.
+-	 */
+-	vcpu->arch.guest_fpu.fpstate->user_xfeatures = vcpu->arch.guest_supported_xcr0 |
+-						       XFEATURE_MASK_FPSSE;
+-
+ 	kvm_update_pv_runtime(vcpu);
+ 
+ 	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index a43a950d04cb..a4a44adf7c72 100644
+--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
+@@ -5318,12 +5318,26 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
+ static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
+ 					  u8 *state, unsigned int size)
+ {
+	/*
+	 * Only copy state for features that are enabled for the guest.  The
+	 * state itself isn't problematic, but setting bits in the header for
+	 * features that are supported in *this* host but not exposed to the
+	 * guest can result in KVM_SET_XSAVE failing when live migrating to a
+	 * compatible host without the features that are NOT exposed to the
+	 * guest.
+	 *
+	 * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if
+	 * XSAVE/XCRO are not exposed to the guest, and even if XSAVE isn't
+	 * supported by the host.
+	 */
+	u64 supported_xcr0 = vcpu->arch.guest_supported_xcr0 |
+			     XFEATURE_MASK_FPSSE;
+
+ 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
+ 		return;
+ 
+ 	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu, state, size,
+-				       vcpu->arch.guest_fpu.fpstate->user_xfeatures,
+-				       vcpu->arch.pkru);
+				       supported_xcr0, vcpu->arch.pkru);
+ }
+ 
+ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
-Date: Wed, 3 Apr 2024 15:21:58 +0200
-Subject: [PATCH] net: usb: ax88179_178a: avoid the interface always configured
- as random address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-After the commit d2689b6a86b9 ("net: usb: ax88179_178a: avoid two
-consecutive device resets"), reset is not executed from bind operation and
-mac address is not read from the device registers or the devicetree at that
-moment. Since the check to configure if the assigned mac address is random
-or not for the interface, happens after the bind operation from
-usbnet_probe, the interface keeps configured as random address, although the
-address is correctly read and set during open operation (the only reset
-now).
-
-In order to keep only one reset for the device and to avoid the interface
-always configured as random address, after reset, configure correctly the
-suitable field from the driver, if the mac address is read successfully from
-the device registers or the devicetree. Take into account if a locally
-administered address (random) was previously stored.
-
-cc: stable@vger.kernel.org # 6.6+
-Fixes: d2689b6a86b9 ("net: usb: ax88179_178a: avoid two consecutive device resets")
-Reported-by: Dave Stevenson  <dave.stevenson@raspberrypi.com>
-Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://lore.kernel.org/r/20240403132158.344838-1-jtornosm@redhat.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-(cherry picked from commit 2e91bb99b9d4f756e92e83c4453f894dda220f09)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- drivers/net/usb/ax88179_178a.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
-index d837c1887416..e0e9b4c53cb0 100644
--- a/drivers/net/usb/ax88179_178a.c
-+++ b/drivers/net/usb/ax88179_178a.c
-@@ -1273,6 +1273,8 @@ static void ax88179_get_mac_addr(struct usbnet *dev)
- 
- 	if (is_valid_ether_addr(mac)) {
- 		eth_hw_addr_set(dev->net, mac);
-+		if (!is_local_ether_addr(mac))
-+			dev->net->addr_assign_type = NET_ADDR_PERM;
- 	} else {
- 		netdev_info(dev->net, "invalid MAC address, using random\n");
- 		eth_hw_addr_random(dev->net);
@@ -1,83 +0,0 @@
-From fe4261ef5f99878f60290709d10d44bba326f95f Mon Sep 17 00:00:00 2001
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-Date: Sun, 24 Mar 2024 20:51:35 +0100
-Subject: [PATCH] x86/CPU/AMD: Improve the erratum 1386 workaround
-
-Disable XSAVES only on machines which haven't loaded the microcode
-revision containing the erratum fix.
-
-This will come in handy when running archaic OSes as guests. OSes whose
-brilliant programmers thought that CPUID is overrated and one should not
-query it but use features directly, ala shoot first, ask questions
-later... but only if you're alive after the shooting.
-
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-[ FG: port to 6.5 ]
-Signed-off-by: Folke Gleumes <f.gleumes@proxmox.com>
-Tested-by: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
-Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-Link: https://lore.kernel.org/r/20240324200525.GBZgCHhYFsBj12PrKv@fat_crate.local
---
- arch/x86/include/asm/cpu_device_id.h |  8 ++++++++
- arch/x86/kernel/cpu/amd.c            | 11 +++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
-index eb8fcede9e3b..bf4e065cf1e2 100644
--- a/arch/x86/include/asm/cpu_device_id.h
-+++ b/arch/x86/include/asm/cpu_device_id.h
-@@ -190,6 +190,14 @@ struct x86_cpu_desc {
- 	.x86_microcode_rev	= (revision),			\
- }
- 
-+#define AMD_CPU_DESC(fam, model, stepping, revision) {		\
-+	.x86_family		= (fam),			\
-+	.x86_vendor		= X86_VENDOR_AMD,		\
-+	.x86_model		= (model),			\
-+	.x86_stepping		= (stepping),			\
-+	.x86_microcode_rev	= (revision),			\
-+}
-+
- extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
- extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
- 
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 9390074ddb25..8201271f6505 100644
--- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -13,6 +13,7 @@
- #include <asm/apic.h>
- #include <asm/cacheinfo.h>
- #include <asm/cpu.h>
-+#include <asm/cpu_device_id.h>
- #include <asm/spec-ctrl.h>
- #include <asm/smp.h>
- #include <asm/numa.h>
-@@ -945,6 +946,11 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
- 	clear_rdrand_cpuid_bit(c);
- }
- 
-+static const struct x86_cpu_desc erratum_1386_microcode[] = {
-+	AMD_CPU_DESC(0x17,  0x1, 0x2, 0x0800126e),
-+	AMD_CPU_DESC(0x17, 0x31, 0x0, 0x08301052),
-+};
-+
- void init_spectral_chicken(struct cpuinfo_x86 *c)
- {
- #ifdef CONFIG_CPU_UNRET_ENTRY
-@@ -972,7 +978,12 @@ void init_spectral_chicken(struct cpuinfo_x86 *c)
- 	 *
- 	 * Affected parts all have no supervisor XSAVE states, meaning that
- 	 * the XSAVEC instruction (which works fine) is equivalent.
-+	 * Clear the feature flag only on microcode revisions which
-+	 * don't have the fix.
- 	 */
-+	if (x86_cpu_has_min_microcode_rev(erratum_1386_microcode))
-+		return;
-+
- 	clear_cpu_cap(c, X86_FEATURE_XSAVES);
- }
- 
-- 
-2.39.2
-
Author	SHA1	Message	Date
Thomas Lamprecht	7d6cee459e	bump version to 6.2.16-20 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-12-01 14:17:55 +01:00
Thomas Lamprecht	154a9b8606	update ZFS to 2.1.14 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-12-01 14:16:42 +01:00
Thomas Lamprecht	ddd91a3b05	rebase patches on top of Ubuntu-6.2.0-39.40 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-12-01 12:47:24 +01:00
Thomas Lamprecht	b5335f0007	update sources to Ubuntu-6.2.0-39.40 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-12-01 12:47:24 +01:00