update linux-ck-uksm to 5.16.5-1

9 files changed, 110 insertions, 274 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fec6c13d7f3..352b48db8617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck-uksm
-	pkgver = 5.15.13
+	pkgver = 5.16.5
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -12,40 +12,32 @@ pkgbase = linux-ck-uksm
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.13.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.13.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.5.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.5.tar.sign
 	source = config
 	source = more-uarches-20211114.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20211114.tar.gz
-	source = xanmod-patches-from-ck-8ba6612318090567422d49ccc79bc7bbe5484cfc.tar.gz::https://github.com/xanmod/linux-patches/archive/8ba6612318090567422d49ccc79bc7bbe5484cfc.tar.gz
+	source = xanmod-patches-from-ck-6b08df20f31708099a7fbccf5448958b4836118f.tar.gz::https://github.com/xanmod/linux-patches/archive/6b08df20f31708099a7fbccf5448958b4836118f.tar.gz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-	source = 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
-	source = 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
-	source = 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
-	source = 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
-	source = 0006-lg-laptop-Recognize-more-models.patch
-	source = 0007-UKSM.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/uksm-patches/0001-UKSM-for-5.15.patch
-	source = 0008-bbr2.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/bbr2-patches/0001-bbr2-5.15-introduce-BBRv2.patch
-	source = 0009-lru.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/lru-patches-pf-v4/0001-lru-patches.patch
-	source = 0010-block.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/block-patches-v2/0001-block-patches.patch
-	source = 0011-btrfs.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.15/btrfs-patches-v10/0001-btrfs-patches.patch
+	source = 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+	source = 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch
+	source = 0004-UKSM.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.16/uksm-patches/0001-UKSM-for-5.16.patch
+	source = 0005-bbr2.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.16/bbr2-patches/0001-bbr2-5.16-introduce-BBRv2.patch
+	source = 0006-block.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.16/block-patches/0001-block-patches.patch
+	source = 0007-btrfs.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.16/btrfs-patches-v3/0001-btrfs-patches.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	b2sums = ea8775ffb1e25107b62dfe7acac4e9098094f7e1cd9846566cdf9fc1f0a6e2520f27dc48ce85c29e91032eb21a6f6682f6698a91b02b9424f2d895b5c9b468ec
+	b2sums = 9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4
 	b2sums = SKIP
 	b2sums = f28074511e1a26285298b713e51eed529d25defbc65e056bbb775d86d43a88936bd89c5656c6851f6de70b72fec066f330e657d4df73d385327c4df0a997a0a0
 	b2sums = 534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d
-	b2sums = cf589ec357a96b9e573bce298bb1d64fa50339ea047767f2a730a8dc9808e2316b3e7c885d730233ba50d570725d4c72632d1b74a371ef02ac471d4c944fe63e
-	b2sums = 4e8607f63c08ccb80e27de7af7eda49fb74212f2900d62d0b1dc67100c720ed6f4bd5423d71198a790e92bdc49998d78dd8bbb1cf25f449ada38c00ae1318467
-	b2sums = 6d52e045fef48f882d8a1dd96aff084e46f28b0bf719f664030f210a5f236b0d8ea3a4151597ccc7a7d404d39a5f965a4bdbe18c9cbaea7687355ec0515908f9
-	b2sums = 186cbcbe54d3135aadc704eeaba4453f30fbc495262c9f753c53ba25e895c71da25c432fe716795f1ca69199718d3920bda937889f84430c5db2795ae61440d9
-	b2sums = 716bce9038188e4f49f2ac9fcd399a1f8d1730af4442ff028977522e9d42994f25e22f4d41238d43ab73afc896e7b177a4d581b7f40af36a3e41e3a6ac2afa46
-	b2sums = c0f4b5f99c96a482c224043f0b901458dc9bbf5ae87f4456bc3553a608c8222b4ca7bb05bd9c71a674465ba6a09b27fa2762f4a458f6be49793a5a9952910a95
-	b2sums = 9a0763fee4e54076c721a0d0de53ed152f6ba24381e35d81ba023ce576ed89568be3b5afb56d489609a897971b9db6fa86646ae98be744dbff3b33b35b66cebb
-	b2sums = 33ecbb3c7c3887b187fe951dd1fb897ab5378ecb1e01fa290c31782b10925b5874f0ded96b7a8a2693497fbee2965e9b5e9ff421934fce8a98508af4425ca260
-	b2sums = e83b6ae58a6906f97e1ada7369b6dad8ccfb0264537b128e6815d2f47493b20b682c6852621fba75f5a23e92d7c0590bffb7dd7f0960bd33b23434477dde7079
-	b2sums = d2faeab363dd0f3f6d778d3967c3aef77a900247fd9e2ca7bbb94953c79cc8e37bf0dbc4c9d060dadcdaf6883b61f14439ecf63c97b50a1b762eb77b8b61b1a7
-	b2sums = defd550aa7b67834fdf2fce402e3ce260bdaa8a2778d31d6c9d2674e43d0ee5fc609df156752fb7482c7453d34725e6edca9764a183f5011a198f8dc10fc6459
-	b2sums = dcdd7573488185dc5e516f128e606efe407ccb7026d92bb56998c79a8cd276f79abc2bca1f403fc173a10a13766c079ea63623768f1e7603110ca9751ee9ab70
+	b2sums = 7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a
+	b2sums = 163ca2dc04f259cc99a58bc9ef25a54757b82ddc68ac40fdf21fa9f877d901aacf5081f6a44d2b2041ad731afaeac863549834f652a9622eaa84db44965525ec
+	b2sums = 0d264914102c22a3addd23ae94dbf8eba666c833ffd2c78d1a4f2633407365c4e5c5a84c95576f37ddf37759820b05d26ee80de2120f71e04b75559793a90385
+	b2sums = b18b3d5d005bc9cb1479899534f35dc3797e0094fd1304ef57ef5e6e786ec7fbe7364a4421769ab4a4098a6150db0b93ae36043504c4f78251fef8ca2cc4791e
+	b2sums = 9139215eb0d7af1448c1b1722059430f8aa95b4c8d7611776599cc94064e9ec7e09b02c2fd07487a3aa1b73ecefad09c7944eec73a2f0a422cda049aaed58847
+	b2sums = c744ca79e711adf08c65c73f7ab08a95a8c62ab8fd869a8db27add9874a559e226582823660d236ffb56d839d868f1c39bb82b77dbdb0bbdae93d4336a7decb5
+	b2sums = ede2f6ade748cac8e2ed46e092c7551f93cebe32b98b61911908d7d3ab2ee0ea08091b17723ebb2016c92b0488c74bb13b4c4453ea4fcc57c3cf38231c7eefbf
+	b2sums = 30e29df1351df2989858426fec54c9aa40618ee5af1cc89d433fea66b879f6dc4e6918e27e8f96122c86de91a56dcf62f8e36cbf35f8a014901a2134abe1a5b4
 
 pkgname = linux-ck-uksm
 	pkgdesc = The Linux-ck-uksm kernel and modules with ck's hrtimer,bbr2 patches,etc
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index c984dd0f5147..8ee98765b827 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 0948f6ce6d898c598f8fe88240954e578fdc8387 Mon Sep 17 00:00:00 2001
+From 0532d2afac2ebe0cb5de82ce53492e18141a2e72 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644
  {
  	return &init_user_ns;
 diff --git a/init/Kconfig b/init/Kconfig
-index 11f8a845f259..02b7a0e455a5 100644
+index 4b7bac10c72d..40ea1367f14a 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1226,6 +1226,22 @@ config USER_NS
+@@ -1231,6 +1231,22 @@ config USER_NS
  
  	  If unsure, say N.
  
@@ -63,10 +63,10 @@ index 11f8a845f259..02b7a0e455a5 100644
  	bool "PID Namespaces"
  	default y
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 10885c649ca4..e0fe98e1afbd 100644
+index 3244cc56b697..ea4d51d3eda9 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -98,6 +98,10 @@
+@@ -97,6 +97,10 @@
  #include <linux/io_uring.h>
  #include <linux/bpf.h>
  
@@ -77,7 +77,7 @@ index 10885c649ca4..e0fe98e1afbd 100644
  #include <asm/pgalloc.h>
  #include <linux/uaccess.h>
  #include <asm/mmu_context.h>
-@@ -1950,6 +1954,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1947,6 +1951,10 @@ static __latent_entropy struct task_struct *copy_process(
  	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
  		return ERR_PTR(-EINVAL);
  
@@ -88,7 +88,7 @@ index 10885c649ca4..e0fe98e1afbd 100644
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -3056,6 +3064,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -3053,6 +3061,12 @@ int ksys_unshare(unsigned long unshare_flags)
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
@@ -150,5 +150,5 @@ index 6b2e3ca7ee99..0253002184f1 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.34.1
+2.35.0
 
diff --git a/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
index e8b1c3036b51..8493375f2e05 100644
--- a/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+++ b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
@@ -1,7 +1,7 @@
-From a6d4fb4f5e7fe795d9e3b28b261a0f86f1026d03 Mon Sep 17 00:00:00 2001
+From 70cb00864cd424dd777fb97e637e31c7d949d81c Mon Sep 17 00:00:00 2001
 From: Kiran K <kiran.k@intel.com>
 Date: Wed, 13 Oct 2021 13:35:11 +0530
-Subject: [PATCH 5/7] Bluetooth: btintel: Fix bdaddress comparison with garbage
+Subject: [PATCH 2/4] Bluetooth: btintel: Fix bdaddress comparison with garbage
  value
 
 Intel Read Verision(TLV) data is parsed into a local structure variable
@@ -11,15 +11,17 @@ only if controller is present in boot loader mode.
 
 Signed-off-by: Kiran K <kiran.k@intel.com>
 Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+(cherry picked from commit 893505319c74cf3faa45a5ed9d5338ff03b66949)
 ---
  drivers/bluetooth/btintel.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
-index f1705b46fc88..b9055a3e61ed 100644
+index 851a0c9b8fae..1a4f8b227eac 100644
 --- a/drivers/bluetooth/btintel.c
 +++ b/drivers/bluetooth/btintel.c
-@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
+@@ -2081,14 +2081,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
  	if (ver->img_type == 0x03) {
  		btintel_clear_flag(hdev, INTEL_BOOTLOADER);
  		btintel_check_bdaddr(hdev);
@@ -44,7 +46,7 @@ index f1705b46fc88..b9055a3e61ed 100644
  	}
  
  	btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");
-@@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)
+@@ -2467,6 +2469,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)
  		goto exit_error;
  	}
  
@@ -56,5 +58,5 @@ index f1705b46fc88..b9055a3e61ed 100644
  	err = btintel_parse_version_tlv(hdev, &ver_tlv, skb);
  	if (err) {
 -- 
-2.34.1
+2.35.0
 
diff --git a/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch b/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
deleted file mode 100644
index d7f5fc8e35b7..000000000000
--- a/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0bb6e4f104167b1e283269b46f3bbd30b2d979a7 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Thu, 18 Nov 2021 22:53:31 +0100
-Subject: [PATCH 2/7] PCI: Add more NVIDIA controllers to the MSI masking quirk
-
-For: https://bugs.archlinux.org/task/72734
-For: https://bugs.archlinux.org/task/72777
----
- drivers/pci/quirks.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 208fa03acdda..7fdb7e9c2e12 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5802,3 +5802,5 @@ static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)
- 	pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
- }
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab9, nvidia_ion_ahci_fixup);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0d88, nvidia_ion_ahci_fixup);
--- 
-2.34.1
-
diff --git a/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch
new file mode 100644
index 000000000000..9b8e948cb97e
--- /dev/null
+++ b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch
@@ -0,0 +1,56 @@
+From db071152c6a3ebcc82426cbd2ce97d74ba3f6513 Mon Sep 17 00:00:00 2001
+From: Kiran K <kiran.k@intel.com>
+Date: Tue, 5 Oct 2021 20:15:56 +0530
+Subject: [PATCH 3/4] Bluetooth: Read codec capabilities only if supported
+
+Read codec capabilities only if HCI_READ_LOCAL_CODEC_CAPABILITIES
+command is supported. If capablities are not supported, then
+cache codec data without caps.
+
+Signed-off-by: Kiran K <kiran.k@intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+For: https://bugs.archlinux.org/task/73454
+---
+ net/bluetooth/hci_codec.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c
+index f0421d0edaa3..38201532f58e 100644
+--- a/net/bluetooth/hci_codec.c
++++ b/net/bluetooth/hci_codec.c
+@@ -25,9 +25,11 @@ static int hci_codec_list_add(struct list_head *list,
+ 	}
+ 	entry->transport = sent->transport;
+ 	entry->len = len;
+-	entry->num_caps = rp->num_caps;
+-	if (rp->num_caps)
++	entry->num_caps = 0;
++	if (rp) {
++		entry->num_caps = rp->num_caps;
+ 		memcpy(entry->caps, caps, len);
++	}
+ 	list_add(&entry->list, list);
+ 
+ 	return 0;
+@@ -58,6 +60,18 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport,
+ 			__u32 len;
+ 
+ 			cmd->transport = i;
++
++			/* If Read_Codec_Capabilities command is not supported
++			 * then just add codec to the list without caps
++			 */
++			if (!(hdev->commands[45] & 0x08)) {
++				hci_dev_lock(hdev);
++				hci_codec_list_add(&hdev->local_codecs, cmd,
++						   NULL, NULL, 0);
++				hci_dev_unlock(hdev);
++				continue;
++			}
++
+ 			skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS,
+ 					     sizeof(*cmd), cmd,
+ 					     HCI_CMD_TIMEOUT);
+-- 
+2.35.0
+
diff --git a/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch b/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
deleted file mode 100644
index 38f3e917a30a..000000000000
--- a/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 32803dc7c2ffc29db15a46034d818f6e6c5775ef Mon Sep 17 00:00:00 2001
-From: Ajay Garg <ajaygargnsit@gmail.com>
-Date: Tue, 12 Oct 2021 19:26:53 +0530
-Subject: [PATCH 3/7] iommu: intel: do deep dma-unmapping, to avoid
- kernel-flooding.
-
-Origins at :
-https://lists.linuxfoundation.org/pipermail/iommu/2021-October/thread.html
-
-=== Changes from v1 => v2 ===
-
-a)
-Improved patch-description.
-
-b)
-A more root-level fix, as suggested by
-
-	1.
-	Alex Williamson <alex.williamson@redhat.com>
-
-	2.
-	Lu Baolu <baolu.lu@linux.intel.com>
-
-=== Issue ===
-
-Kernel-flooding is seen, when an x86_64 L1 guest (Ubuntu-21) is booted in qemu/kvm
-on a x86_64 host (Ubuntu-21), with a host-pci-device attached.
-
-Following kind of logs, along with the stacktraces, cause the flood :
-
-......
- DMAR: ERROR: DMA PTE for vPFN 0x428ec already set (to 3f6ec003 not 3f6ec003)
- DMAR: ERROR: DMA PTE for vPFN 0x428ed already set (to 3f6ed003 not 3f6ed003)
- DMAR: ERROR: DMA PTE for vPFN 0x428ee already set (to 3f6ee003 not 3f6ee003)
- DMAR: ERROR: DMA PTE for vPFN 0x428ef already set (to 3f6ef003 not 3f6ef003)
- DMAR: ERROR: DMA PTE for vPFN 0x428f0 already set (to 3f6f0003 not 3f6f0003)
-......
-
-=== Current Behaviour, leading to the issue ===
-
-Currently, when we do a dma-unmapping, we unmap/unlink the mappings, but
-the pte-entries are not cleared.
-
-Thus, following sequencing would flood the kernel-logs :
-
-i)
-A dma-unmapping makes the real/leaf-level pte-slot invalid, but the
-pte-content itself is not cleared.
-
-ii)
-Now, during some later dma-mapping procedure, as the pte-slot is about
-to hold a new pte-value, the intel-iommu checks if a prior
-pte-entry exists in the pte-slot. If it exists, it logs a kernel-error,
-along with a corresponding stacktrace.
-
-iii)
-Step ii) runs in abundance, and the kernel-logs run insane.
-
-=== Fix ===
-
-We ensure that as part of a dma-unmapping, each (unmapped) pte-slot
-is also cleared of its value/content (at the leaf-level, where the
-real mapping from a iova => pfn mapping is stored).
-
-This completes a "deep" dma-unmapping.
-
-Signed-off-by: Ajay Garg <ajaygargnsit@gmail.com>
-Link: https://lore.kernel.org/linux-iommu/20211012135653.3852-1-ajaygargnsit@gmail.com/
----
- drivers/iommu/intel/iommu.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 78f8c8e6803e..d8da48a91ba3 100644
---- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -5092,6 +5092,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
- 	gather->freelist = domain_unmap(dmar_domain, start_pfn,
- 					last_pfn, gather->freelist);
- 
-+	dma_pte_clear_range(dmar_domain, start_pfn, last_pfn);
-+
- 	if (dmar_domain->max_addr == iova + size)
- 		dmar_domain->max_addr = iova;
- 
--- 
-2.34.1
-
diff --git a/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch b/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
deleted file mode 100644
index 830f505cbb8f..000000000000
--- a/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From aa7300919d0656a001fe0d526508b8c5958e7630 Mon Sep 17 00:00:00 2001
-From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
-Date: Thu, 18 Nov 2021 21:18:01 -0800
-Subject: [PATCH 4/7] cpufreq: intel_pstate: ITMT support for overclocked
- system
-
-On systems with overclocking enabled, CPPC Highest Performance can be
-hard coded to 0xff. In this case even if we have cores with different
-highest performance, ITMT can't be enabled as the current implementation
-depends on CPPC Highest Performance.
-
-On such systems we can use MSR_HWP_CAPABILITIES maximum performance field
-when CPPC.Highest Performance is 0xff.
-
-Due to legacy reasons, we can't solely depend on MSR_HWP_CAPABILITIES as
-in some older systems CPPC Highest Performance is the only way to identify
-different performing cores.
-
-Reported-by: Michael Larabel <Michael@MichaelLarabel.com>
-Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
----
- drivers/cpufreq/intel_pstate.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index e15c3bc17a55..8a2c6b58b652 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -335,6 +335,8 @@ static void intel_pstste_sched_itmt_work_fn(struct work_struct *work)
- 
- static DECLARE_WORK(sched_itmt_work, intel_pstste_sched_itmt_work_fn);
- 
-+#define CPPC_MAX_PERF	U8_MAX
-+
- static void intel_pstate_set_itmt_prio(int cpu)
- {
- 	struct cppc_perf_caps cppc_perf;
-@@ -345,6 +347,14 @@ static void intel_pstate_set_itmt_prio(int cpu)
- 	if (ret)
- 		return;
- 
-+	/*
-+	 * On some systems with overclocking enabled, CPPC.highest_perf is hardcoded to 0xff.
-+	 * In this case we can't use CPPC.highest_perf to enable ITMT.
-+	 * In this case we can look at MSR_HWP_CAPABILITIES bits [8:0] to decide.
-+	 */
-+	if (cppc_perf.highest_perf == CPPC_MAX_PERF)
-+		cppc_perf.highest_perf = HWP_HIGHEST_PERF(READ_ONCE(all_cpu_data[cpu]->hwp_cap_cached));
-+
- 	/*
- 	 * The priorities can be set regardless of whether or not
- 	 * sched_set_itmt_support(true) has been called and it is valid to
--- 
-2.34.1
-
diff --git a/0006-lg-laptop-Recognize-more-models.patch b/0006-lg-laptop-Recognize-more-models.patch
deleted file mode 100644
index 8e554b7bbdee..000000000000
--- a/0006-lg-laptop-Recognize-more-models.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 72edf8c167268bb68d701f46006ccfdfa5490db8 Mon Sep 17 00:00:00 2001
-From: Matan Ziv-Av <matan@svgalib.org>
-Date: Tue, 23 Nov 2021 22:14:55 +0200
-Subject: [PATCH 6/7] lg-laptop: Recognize more models
-
-LG uses 5 instead of 0 in the third digit (second digit after 2019) of the year string to indicate newer models in the same year. Handle this case as well.
-
-Signed-off-by: Matan Ziv-Av <matan@svgalib.org>
-For: https://bugs.archlinux.org/task/71772
----
- drivers/platform/x86/lg-laptop.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
-index 88b551caeaaf..d6f74d3a7605 100644
---- a/drivers/platform/x86/lg-laptop.c
-+++ b/drivers/platform/x86/lg-laptop.c
-@@ -658,6 +658,18 @@ static int acpi_add(struct acpi_device *device)
- 	if (product && strlen(product) > 4)
- 		switch (product[4]) {
- 		case '5':
-+			if (strlen(product) > 5)
-+				switch (product[5]) {
-+				case 'N':
-+					year = 2021;
-+					break;
-+				case '0':
-+					year = 2016;
-+					break;
-+				default:
-+					year = 2022;
-+				}
-+			break;
- 		case '6':
- 			year = 2016;
- 			break;
--- 
-2.34.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 2e3d14697ac8..2d2814b0fad8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -77,9 +77,9 @@ fi
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-ck-uksm
-pkgver=5.15.13
+pkgver=5.16.5
 pkgrel=1
-_major=5.15
+_major=5.16
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
 license=(GPL2)
@@ -93,7 +93,7 @@ _patches_url="https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_major}
 _jobs=$(nproc)
 # https://ck-hack.blogspot.com/2021/08/514-and-future-of-muqss-and-ck-once.html
 # thankfully xanmod keeps the hrtimer patches up to date
-_commit=8ba6612318090567422d49ccc79bc7bbe5484cfc
+_commit=6b08df20f31708099a7fbccf5448958b4836118f
 _xan=linux-5.15.y-xanmod
 
 source=("https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar".{xz,sign}
@@ -101,16 +101,12 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar".{xz,s
         "more-uarches-${_gcc_more_v}.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/${_gcc_more_v}.tar.gz"
         "xanmod-patches-from-ck-${_commit}.tar.gz::https://github.com/xanmod/linux-patches/archive/${_commit}.tar.gz"
         0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-        0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
-        0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
-        0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
-        0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
-        0006-lg-laptop-Recognize-more-models.patch
-        "0007-UKSM.patch::${_patches_url}/uksm-patches/0001-UKSM-for-${_major}.patch"
-        "0008-bbr2.patch::${_patches_url}/bbr2-patches/0001-bbr2-${_major}-introduce-BBRv2.patch"
-        "0009-lru.patch::${_patches_url}/lru-patches-pf-v4/0001-lru-patches.patch"
-        "0010-block.patch::${_patches_url}/block-patches-v2/0001-block-patches.patch"
-        "0011-btrfs.patch::${_patches_url}/btrfs-patches-v10/0001-btrfs-patches.patch"
+        0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+        0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch
+        "0004-UKSM.patch::${_patches_url}/uksm-patches/0001-UKSM-for-${_major}.patch"
+        "0005-bbr2.patch::${_patches_url}/bbr2-patches/0001-bbr2-${_major}-introduce-BBRv2.patch"
+        "0006-block.patch::${_patches_url}/block-patches/0001-block-patches.patch"
+        "0007-btrfs.patch::${_patches_url}/btrfs-patches-v3/0001-btrfs-patches.patch"
 )
 
 validpgpkeys=(
@@ -118,22 +114,18 @@ validpgpkeys=(
               '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 
-b2sums=('ea8775ffb1e25107b62dfe7acac4e9098094f7e1cd9846566cdf9fc1f0a6e2520f27dc48ce85c29e91032eb21a6f6682f6698a91b02b9424f2d895b5c9b468ec'
+b2sums=('9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4'
         'SKIP'
         'f28074511e1a26285298b713e51eed529d25defbc65e056bbb775d86d43a88936bd89c5656c6851f6de70b72fec066f330e657d4df73d385327c4df0a997a0a0'
         '534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d'
-        'cf589ec357a96b9e573bce298bb1d64fa50339ea047767f2a730a8dc9808e2316b3e7c885d730233ba50d570725d4c72632d1b74a371ef02ac471d4c944fe63e'
-        '4e8607f63c08ccb80e27de7af7eda49fb74212f2900d62d0b1dc67100c720ed6f4bd5423d71198a790e92bdc49998d78dd8bbb1cf25f449ada38c00ae1318467'
-        '6d52e045fef48f882d8a1dd96aff084e46f28b0bf719f664030f210a5f236b0d8ea3a4151597ccc7a7d404d39a5f965a4bdbe18c9cbaea7687355ec0515908f9'
-        '186cbcbe54d3135aadc704eeaba4453f30fbc495262c9f753c53ba25e895c71da25c432fe716795f1ca69199718d3920bda937889f84430c5db2795ae61440d9'
-        '716bce9038188e4f49f2ac9fcd399a1f8d1730af4442ff028977522e9d42994f25e22f4d41238d43ab73afc896e7b177a4d581b7f40af36a3e41e3a6ac2afa46'
-        'c0f4b5f99c96a482c224043f0b901458dc9bbf5ae87f4456bc3553a608c8222b4ca7bb05bd9c71a674465ba6a09b27fa2762f4a458f6be49793a5a9952910a95'
-        '9a0763fee4e54076c721a0d0de53ed152f6ba24381e35d81ba023ce576ed89568be3b5afb56d489609a897971b9db6fa86646ae98be744dbff3b33b35b66cebb'
-        '33ecbb3c7c3887b187fe951dd1fb897ab5378ecb1e01fa290c31782b10925b5874f0ded96b7a8a2693497fbee2965e9b5e9ff421934fce8a98508af4425ca260'
-        'e83b6ae58a6906f97e1ada7369b6dad8ccfb0264537b128e6815d2f47493b20b682c6852621fba75f5a23e92d7c0590bffb7dd7f0960bd33b23434477dde7079'
-        'd2faeab363dd0f3f6d778d3967c3aef77a900247fd9e2ca7bbb94953c79cc8e37bf0dbc4c9d060dadcdaf6883b61f14439ecf63c97b50a1b762eb77b8b61b1a7'
-        'defd550aa7b67834fdf2fce402e3ce260bdaa8a2778d31d6c9d2674e43d0ee5fc609df156752fb7482c7453d34725e6edca9764a183f5011a198f8dc10fc6459'
-        'dcdd7573488185dc5e516f128e606efe407ccb7026d92bb56998c79a8cd276f79abc2bca1f403fc173a10a13766c079ea63623768f1e7603110ca9751ee9ab70')
+        '7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a'
+        '163ca2dc04f259cc99a58bc9ef25a54757b82ddc68ac40fdf21fa9f877d901aacf5081f6a44d2b2041ad731afaeac863549834f652a9622eaa84db44965525ec'
+        '0d264914102c22a3addd23ae94dbf8eba666c833ffd2c78d1a4f2633407365c4e5c5a84c95576f37ddf37759820b05d26ee80de2120f71e04b75559793a90385'
+        'b18b3d5d005bc9cb1479899534f35dc3797e0094fd1304ef57ef5e6e786ec7fbe7364a4421769ab4a4098a6150db0b93ae36043504c4f78251fef8ca2cc4791e'
+        '9139215eb0d7af1448c1b1722059430f8aa95b4c8d7611776599cc94064e9ec7e09b02c2fd07487a3aa1b73ecefad09c7944eec73a2f0a422cda049aaed58847'
+        'c744ca79e711adf08c65c73f7ab08a95a8c62ab8fd869a8db27add9874a559e226582823660d236ffb56d839d868f1c39bb82b77dbdb0bbdae93d4336a7decb5'
+        'ede2f6ade748cac8e2ed46e092c7551f93cebe32b98b61911908d7d3ab2ee0ea08091b17723ebb2016c92b0488c74bb13b4c4453ea4fcc57c3cf38231c7eefbf'
+        '30e29df1351df2989858426fec54c9aa40618ee5af1cc89d433fea66b879f6dc4e6918e27e8f96122c86de91a56dcf62f8e36cbf35f8a014901a2134abe1a5b4')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase