Update to 6.5.5-1

13 files changed, 63 insertions, 177 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e68457ce3897..f4ed4d794b85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = linux-ck
-	pkgver = 6.5.4
-	pkgrel = 2
+	pkgver = 6.5.5
+	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
 	makedepends = cpio
 	makedepends = gettext
-	makedepends = git
 	makedepends = libelf
 	makedepends = pahole
 	makedepends = python
@@ -15,8 +14,8 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.4.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.4.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.5.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.5.tar.sign
 	source = config
 	source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz
 	source = ck-hrtimer-6ef0e9ff5db0ed380f98cc8c7436ca9c44ea32c9.tar.gz::https://github.com/graysky2/linux-patches/archive/6ef0e9ff5db0ed380f98cc8c7436ca9c44ea32c9.tar.gz
@@ -29,26 +28,24 @@ pkgbase = linux-ck
 	source = 0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch
 	source = 0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch
 	source = 0009-net-wwan-t7xx-Add-AP-CLDMA.patch
-	source = 0010-nvme-avoid-bogus-CRTO-values.patch
-	source = 0011-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
+	source = 0010-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669
+	sha256sums = 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95
 	sha256sums = SKIP
 	sha256sums = 46451dbc3305d4c2e726a2f1943bddf697c5bb6815d93e5baed80bca82e53fdc
 	sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0
 	sha256sums = a86a59d089ddd4f31565ff6a27ba74f4697ffa0ab0f57dc839e1da6ab83d77a4
-	sha256sums = e83c0dfa73fafb09b24a38e0c62767515177ae8e29eb511592f0af0083a08a97
-	sha256sums = 0fbc4ce4428ac446752dc192709c21764018abf03046402ddd27409f2fac7172
-	sha256sums = 8cac889e375641832fdc68eddd16e7c2febe0207cd117710d0d1876270afd4c7
-	sha256sums = 36ad01102f1005d855c5e0c9d6b91e2b24654e7e971a32c1f3acb6a59bf4b270
-	sha256sums = 32da7426bb107b29835ce45322ca40fb0c1c56f90574bec8e8fc9b94f5255220
-	sha256sums = 5208324060bc7ac4d418a5503763f6f0f7e99c79b83216ebfde4ac778942bf66
-	sha256sums = fc655539835f8910841da651c46f4d709c6d82cf578066e0c5c25c0588228aee
-	sha256sums = ec8a7654fc9900923b85f2876e61e8bd7bffe9c8a85ee07b3cb7af47b01dc578
-	sha256sums = 30c1656ae0776a769373eb3dca9587e398d5a05517bfa30a3c1573861ad4b155
-	sha256sums = 96babd7c1ab75f4b5d2b512cbb105857242419ac1fc5bc41a207fd95a99f4b35
-	sha256sums = 5376296a6c24bfdcb7f6f5f0eddb5dd9a12dedfbeb92d4fe6185828db9988494
+	sha256sums = 9277f8bd1f8450edaf36ca124d5019520cf9c6f28513dc1dab1f7159be03dfb5
+	sha256sums = 5ed15d63106e050c6aa92874fcb33b1f827702d42d4281a4b0366e2387f01a07
+	sha256sums = 882313cbb296e62dec0d1780aad2c3086fc0fbba86438dd5cef0a1b9519a4224
+	sha256sums = fa3b984d08e4d764cb6df48d9cafe19284cce059e7856b0e860bce332e92890b
+	sha256sums = 3dfd78e809b04a8f1374687f5be667a6275625b08f068a44470c3f2a8a37d4a1
+	sha256sums = c623b7ac173cdd19a537d0767b7b82b13f166a9705cad16896556e8b9f7d3c87
+	sha256sums = b6682cec5ea11cc06c27be8c3f0dc25f0168f28308e64c84d4c53f012d02f282
+	sha256sums = 6bf774b0294488c01fc9392c69c355859d3fa7ea62127c3cb2f11cedf860e848
+	sha256sums = 6c4dfefacd42c571bf53ddaf031566e44832ce87480c63553ddf149620e00e4e
+	sha256sums = 242b8868d2a1c8a403e05c0da85f0dc48192ff22adad97e552b4213a19839676
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
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 5e543ce18b22..fa1ec075fed3 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 5681f5c2be9f5c088cafcd014edd21814771435c Mon Sep 17 00:00:00 2001
+From f9fd190932aac4c6fd677adf726d3402ee8cab02 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 01/12] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/11] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
@@ -63,7 +63,7 @@ index 5e7d4885d1bf..13ad93775237 100644
  	bool "PID Namespaces"
  	default y
 diff --git a/kernel/fork.c b/kernel/fork.c
-index d2e12b6d2b18..95ca80492a37 100644
+index f81149739eb9..36fb0b711541 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -100,6 +100,10 @@
@@ -77,7 +77,7 @@ index d2e12b6d2b18..95ca80492a37 100644
  #include <asm/pgalloc.h>
  #include <linux/uaccess.h>
  #include <asm/mmu_context.h>
-@@ -2263,6 +2267,10 @@ __latent_entropy struct task_struct *copy_process(
+@@ -2271,6 +2275,10 @@ __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 d2e12b6d2b18..95ca80492a37 100644
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -3416,6 +3424,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -3424,6 +3432,12 @@ int ksys_unshare(unsigned long unshare_flags)
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
diff --git a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
index 0b90a24b3139..873c3be2bde0 100644
--- a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
+++ b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
@@ -1,7 +1,7 @@
-From e8fe6978baa2399d67ad282fd88ffe5055785511 Mon Sep 17 00:00:00 2001
+From c25007584d35a8aa500377707ed720c65feb6cc3 Mon Sep 17 00:00:00 2001
 From: Javier Martinez Canillas <javierm@redhat.com>
 Date: Thu, 19 May 2022 14:40:07 +0200
-Subject: [PATCH 02/12] drivers/firmware: skip simpledrm if
+Subject: [PATCH 02/11] drivers/firmware: skip simpledrm if
  nvidia-drm.modeset=1 is set
 
 The Nvidia proprietary driver has some bugs that leads to issues if used
diff --git a/0003-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch b/0003-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
index 387d6335c264..12b3a59ff631 100644
--- a/0003-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
+++ b/0003-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
@@ -1,7 +1,7 @@
-From 1bb932dfe6f18ba9472ec0d89ba69d8858f6405b Mon Sep 17 00:00:00 2001
+From e2769cbe16602a8762db15a442fa587ada5c6ba6 Mon Sep 17 00:00:00 2001
 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 Date: Tue, 5 Sep 2023 11:16:16 -0400
-Subject: [PATCH 03/12] ASoC: Intel: soc-acpi: fix Dell SKU 0B34
+Subject: [PATCH 03/11] ASoC: Intel: soc-acpi: fix Dell SKU 0B34
 
 The rule for the SoundWire tables is that the platforms with more
 devices need to be added first. We broke that rule with the Dell SKU
diff --git a/0004-btrfs-wait-on-uncached-block-groups-on-every-allocat.patch b/0004-btrfs-wait-on-uncached-block-groups-on-every-allocat.patch
index 1a26929cc527..098b223d22c4 100644
--- a/0004-btrfs-wait-on-uncached-block-groups-on-every-allocat.patch
+++ b/0004-btrfs-wait-on-uncached-block-groups-on-every-allocat.patch
@@ -1,7 +1,7 @@
-From 07d424465a582144b433c37b4b7921f2d35f5507 Mon Sep 17 00:00:00 2001
+From 524fd94b5cda448b96d505e3da9ef07beb51b38c Mon Sep 17 00:00:00 2001
 From: Josef Bacik <josef@toxicpanda.com>
 Date: Mon, 31 Jul 2023 16:28:43 -0400
-Subject: [PATCH 04/12] btrfs: wait on uncached block groups on every
+Subject: [PATCH 04/11] btrfs: wait on uncached block groups on every
  allocation loop
 
 My initial fix for the generic/475 hangs was related to metadata, but
@@ -96,10 +96,10 @@ Signed-off-by: David Sterba <dsterba@suse.com>
  2 files changed, 22 insertions(+), 52 deletions(-)
 
 diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
-index e5566827da17..4eca7eb51594 100644
+index 0917c5f39e3d..c8a598c3e11b 100644
 --- a/fs/btrfs/extent-tree.c
 +++ b/fs/btrfs/extent-tree.c
-@@ -3427,7 +3427,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,
+@@ -3481,7 +3481,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,
   * Helper function for find_free_extent().
   *
   * Return -ENOENT to inform caller that we need fallback to unclustered mode.
@@ -107,7 +107,7 @@ index e5566827da17..4eca7eb51594 100644
   * Return >0 to inform caller that we find nothing
   * Return 0 means we have found a location and set ffe_ctl->found_offset.
   */
-@@ -3508,14 +3507,6 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
+@@ -3562,14 +3561,6 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
  			trace_btrfs_reserve_extent_cluster(bg, ffe_ctl);
  			return 0;
  		}
@@ -122,7 +122,7 @@ index e5566827da17..4eca7eb51594 100644
  	}
  	/*
  	 * At this point we either didn't find a cluster or we weren't able to
-@@ -3530,7 +3521,6 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
+@@ -3584,7 +3575,6 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
  /*
   * Return >0 to inform caller that we find nothing
   * Return 0 when we found an free extent and set ffe_ctrl->found_offset
@@ -130,7 +130,7 @@ index e5566827da17..4eca7eb51594 100644
   */
  static int find_free_extent_unclustered(struct btrfs_block_group *bg,
  					struct find_free_extent_ctl *ffe_ctl)
-@@ -3568,25 +3558,8 @@ static int find_free_extent_unclustered(struct btrfs_block_group *bg,
+@@ -3622,25 +3612,8 @@ static int find_free_extent_unclustered(struct btrfs_block_group *bg,
  	offset = btrfs_find_space_for_alloc(bg, ffe_ctl->search_start,
  			ffe_ctl->num_bytes, ffe_ctl->empty_size,
  			&ffe_ctl->max_extent_size);
@@ -157,7 +157,7 @@ index e5566827da17..4eca7eb51594 100644
  	ffe_ctl->found_offset = offset;
  	return 0;
  }
-@@ -3600,7 +3573,7 @@ static int do_allocation_clustered(struct btrfs_block_group *block_group,
+@@ -3654,7 +3627,7 @@ static int do_allocation_clustered(struct btrfs_block_group *block_group,
  	/* We want to try and use the cluster allocator, so lets look there */
  	if (ffe_ctl->last_ptr && ffe_ctl->use_cluster) {
  		ret = find_free_extent_clustered(block_group, ffe_ctl, bg_ret);
@@ -166,7 +166,7 @@ index e5566827da17..4eca7eb51594 100644
  			return ret;
  		/* ret == -ENOENT case falls through */
  	}
-@@ -3819,8 +3792,7 @@ static void release_block_group(struct btrfs_block_group *block_group,
+@@ -3873,8 +3846,7 @@ static void release_block_group(struct btrfs_block_group *block_group,
  {
  	switch (ffe_ctl->policy) {
  	case BTRFS_EXTENT_ALLOC_CLUSTERED:
@@ -176,7 +176,7 @@ index e5566827da17..4eca7eb51594 100644
  		break;
  	case BTRFS_EXTENT_ALLOC_ZONED:
  		/* Nothing to do */
-@@ -4171,9 +4143,7 @@ static noinline int find_free_extent(struct btrfs_root *root,
+@@ -4225,9 +4197,7 @@ static noinline int find_free_extent(struct btrfs_root *root,
  	ffe_ctl->orig_have_caching_bg = false;
  	ffe_ctl->index = btrfs_bg_flags_to_raid_index(ffe_ctl->flags);
  	ffe_ctl->loop = 0;
@@ -187,7 +187,7 @@ index e5566827da17..4eca7eb51594 100644
  	ffe_ctl->cached = 0;
  	ffe_ctl->max_extent_size = 0;
  	ffe_ctl->total_free_space = 0;
-@@ -4324,16 +4294,12 @@ static noinline int find_free_extent(struct btrfs_root *root,
+@@ -4378,16 +4348,12 @@ static noinline int find_free_extent(struct btrfs_root *root,
  
  		bg_ret = NULL;
  		ret = do_allocation(block_group, ffe_ctl, &bg_ret);
@@ -209,7 +209,7 @@ index e5566827da17..4eca7eb51594 100644
  		}
  
  		/* Checks */
-@@ -4374,6 +4340,15 @@ static noinline int find_free_extent(struct btrfs_root *root,
+@@ -4428,6 +4394,15 @@ static noinline int find_free_extent(struct btrfs_root *root,
  		btrfs_release_block_group(block_group, ffe_ctl->delalloc);
  		break;
  loop:
diff --git a/0005-btrfs-set-last-dir-index-to-the-current-last-index-w.patch b/0005-btrfs-set-last-dir-index-to-the-current-last-index-w.patch
index e7c95a263d01..631d5d352fdb 100644
--- a/0005-btrfs-set-last-dir-index-to-the-current-last-index-w.patch
+++ b/0005-btrfs-set-last-dir-index-to-the-current-last-index-w.patch
@@ -1,7 +1,7 @@
-From 930c05e80d31e87982e9f64accb8ffbc6a135687 Mon Sep 17 00:00:00 2001
+From bd1791908538aa7b1a6f47be1def37f9bc6eb4f3 Mon Sep 17 00:00:00 2001
 From: Filipe Manana <fdmanana@suse.com>
 Date: Sat, 9 Sep 2023 11:34:40 +0100
-Subject: [PATCH 05/12] btrfs: set last dir index to the current last index
+Subject: [PATCH 05/11] btrfs: set last dir index to the current last index
  when opening dir
 
 When opening a directory for reading it, we set the last index where we
diff --git a/0006-btrfs-refresh-dir-last-index-during-a-rewinddir-3-ca.patch b/0006-btrfs-refresh-dir-last-index-during-a-rewinddir-3-ca.patch
index 530bfca803e7..d5872f37f9d1 100644
--- a/0006-btrfs-refresh-dir-last-index-during-a-rewinddir-3-ca.patch
+++ b/0006-btrfs-refresh-dir-last-index-during-a-rewinddir-3-ca.patch
@@ -1,7 +1,7 @@
-From cd0498ab46920777435bd0b8e108e0f999320ac2 Mon Sep 17 00:00:00 2001
+From c55297deb6ebf5ba1f3b30e0c37fc05cfe7354ff Mon Sep 17 00:00:00 2001
 From: Filipe Manana <fdmanana@suse.com>
 Date: Sat, 9 Sep 2023 12:12:14 +0100
-Subject: [PATCH 06/12] btrfs: refresh dir last index during a rewinddir(3)
+Subject: [PATCH 06/11] btrfs: refresh dir last index during a rewinddir(3)
  call
 
 When opening a directory we find what's the index of its last entry and
diff --git a/0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch b/0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch
index 0bc05dcc88c5..e4890bc98eed 100644
--- a/0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch
+++ b/0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch
@@ -1,7 +1,7 @@
-From 47c0fdda664600f0568addd32f954a5cb6257fa1 Mon Sep 17 00:00:00 2001
+From ea94fae18504d4c62f97aa0b70bc8b30e4cd6847 Mon Sep 17 00:00:00 2001
 From: Filipe Manana <fdmanana@suse.com>
 Date: Tue, 12 Sep 2023 11:45:39 +0100
-Subject: [PATCH 07/12] btrfs: fix race between reading a directory and adding
+Subject: [PATCH 07/11] btrfs: fix race between reading a directory and adding
  entries to it
 
 When opening a directory (opendir(3)) or rewinding it (rewinddir(3)), we
diff --git a/0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch b/0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch
index 3fb1734d295e..d490fb6cf986 100644
--- a/0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch
+++ b/0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch
@@ -1,7 +1,7 @@
-From c670ecb2eab00d8724859056268835798a78f233 Mon Sep 17 00:00:00 2001
+From 31fa804a07c542fae71aa53f1afd2925485b1bb4 Mon Sep 17 00:00:00 2001
 From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
 Date: Tue, 19 Sep 2023 20:48:55 +0100
-Subject: [PATCH 08/12] i915: Limit the length of an sg list to the requested
+Subject: [PATCH 08/11] i915: Limit the length of an sg list to the requested
  length
 
 The folio conversion changed the behaviour of shmem_sg_alloc_table() to
diff --git a/0009-net-wwan-t7xx-Add-AP-CLDMA.patch b/0009-net-wwan-t7xx-Add-AP-CLDMA.patch
index 53c357a96807..123e98569665 100644
--- a/0009-net-wwan-t7xx-Add-AP-CLDMA.patch
+++ b/0009-net-wwan-t7xx-Add-AP-CLDMA.patch
@@ -1,7 +1,7 @@
-From c21ba287d8ffc883987593b24b4058964e242c84 Mon Sep 17 00:00:00 2001
+From d606d6dd5b99b4dd286bad35c1b9a6f40854ac56 Mon Sep 17 00:00:00 2001
 From: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
 Date: Tue, 11 Jul 2023 08:28:13 +0200
-Subject: [PATCH 09/12] net: wwan: t7xx: Add AP CLDMA
+Subject: [PATCH 09/11] net: wwan: t7xx: Add AP CLDMA
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0011-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch b/0010-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
index 4c30035209f4..9b4d64a6536c 100644
--- a/0011-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
+++ b/0010-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
@@ -1,7 +1,7 @@
-From 595d88a664dc1e7aa175768b8812046265c6de4a Mon Sep 17 00:00:00 2001
+From 04b2ebdedf0b8bbcf106154743144fb57af6d81b Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msuchanek@suse.de>
 Date: Wed, 23 Aug 2023 11:02:33 +0200
-Subject: [PATCH 11/12] Revert 101bd907b424 ("misc: rtsx: judge ASPM Mode to
+Subject: [PATCH 10/11] Revert 101bd907b424 ("misc: rtsx: judge ASPM Mode to
  set PETXCFG Reg")
 
 References: boo#1214428 boo#1214397
diff --git a/0010-nvme-avoid-bogus-CRTO-values.patch b/0010-nvme-avoid-bogus-CRTO-values.patch
deleted file mode 100644
index 8f0ec64378b8..000000000000
--- a/0010-nvme-avoid-bogus-CRTO-values.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 77903a65f87e3abd99082700a144b0f40f8fd029 Mon Sep 17 00:00:00 2001
-From: Keith Busch <kbusch@kernel.org>
-Date: Tue, 12 Sep 2023 14:38:58 -0700
-Subject: [PATCH 10/12] nvme: avoid bogus CRTO values
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 6cc834ba62998c65c42d0c63499bdd35067151ec upstream.
-
-Some devices are reporting controller ready mode support, but return 0
-for CRTO. These devices require a much higher time to ready than that,
-so they are failing to initialize after the driver starter preferring
-that value over CAP.TO.
-
-The spec requires that CAP.TO match the appropritate CRTO value, or be
-set to 0xff if CRTO is larger than that. This means that CAP.TO can be
-used to validate if CRTO is reliable, and provides an appropriate
-fallback for setting the timeout value if not. Use whichever is larger.
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=217863
-Reported-by: Cláudio Sampaio <patola@gmail.com>
-Reported-by: Felix Yan <felixonmars@archlinux.org>
-Tested-by: Felix Yan <felixonmars@archlinux.org>
-Based-on-a-patch-by: Felix Yan <felixonmars@archlinux.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cherry-picked-for: https://bugs.archlinux.org/task/79695
----
- drivers/nvme/host/core.c | 54 ++++++++++++++++++++++++++--------------
- 1 file changed, 35 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index f3a01b79148c..21783aa2ee8e 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -2245,25 +2245,8 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl)
- 	else
- 		ctrl->ctrl_config = NVME_CC_CSS_NVM;
- 
--	if (ctrl->cap & NVME_CAP_CRMS_CRWMS) {
--		u32 crto;
--
--		ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto);
--		if (ret) {
--			dev_err(ctrl->device, "Reading CRTO failed (%d)\n",
--				ret);
--			return ret;
--		}
--
--		if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {
--			ctrl->ctrl_config |= NVME_CC_CRIME;
--			timeout = NVME_CRTO_CRIMT(crto);
--		} else {
--			timeout = NVME_CRTO_CRWMT(crto);
--		}
--	} else {
--		timeout = NVME_CAP_TIMEOUT(ctrl->cap);
--	}
-+	if (ctrl->cap & NVME_CAP_CRMS_CRWMS && ctrl->cap & NVME_CAP_CRMS_CRIMS)
-+		ctrl->ctrl_config |= NVME_CC_CRIME;
- 
- 	ctrl->ctrl_config |= (NVME_CTRL_PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT;
- 	ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;
-@@ -2277,6 +2260,39 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl)
- 	if (ret)
- 		return ret;
- 
-+	/* CAP value may change after initial CC write */
-+	ret = ctrl->ops->reg_read64(ctrl, NVME_REG_CAP, &ctrl->cap);
-+	if (ret)
-+		return ret;
-+
-+	timeout = NVME_CAP_TIMEOUT(ctrl->cap);
-+	if (ctrl->cap & NVME_CAP_CRMS_CRWMS) {
-+		u32 crto, ready_timeout;
-+
-+		ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CRTO, &crto);
-+		if (ret) {
-+			dev_err(ctrl->device, "Reading CRTO failed (%d)\n",
-+				ret);
-+			return ret;
-+		}
-+
-+		/*
-+		 * CRTO should always be greater or equal to CAP.TO, but some
-+		 * devices are known to get this wrong. Use the larger of the
-+		 * two values.
-+		 */
-+		if (ctrl->ctrl_config & NVME_CC_CRIME)
-+			ready_timeout = NVME_CRTO_CRIMT(crto);
-+		else
-+			ready_timeout = NVME_CRTO_CRWMT(crto);
-+
-+		if (ready_timeout < timeout)
-+			dev_warn_once(ctrl->device, "bad crto:%x cap:%llx\n",
-+				      crto, ctrl->cap);
-+		else
-+			timeout = ready_timeout;
-+	}
-+
- 	ctrl->ctrl_config |= NVME_CC_ENABLE;
- 	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);
- 	if (ret)
--- 
-2.42.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 01cdec71e373..cda8a2f47440 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,8 +71,8 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.5.4
-pkgrel=2
+pkgver=6.5.5
+pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
 license=(GPL2)
@@ -80,7 +80,6 @@ makedepends=(
   bc
   cpio
   gettext
-  git
   libelf
   pahole
   python
@@ -111,29 +110,27 @@ source=(
   0007-btrfs-fix-race-between-reading-a-directory-and-addin.patch
   0008-i915-Limit-the-length-of-an-sg-list-to-the-requested.patch
   0009-net-wwan-t7xx-Add-AP-CLDMA.patch
-  0010-nvme-avoid-bogus-CRTO-values.patch
-  0011-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
+  0010-Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch
 )
 validpgpkeys=(
   ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
   647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
 )
-sha256sums=('bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669'
+sha256sums=('8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95'
             'SKIP'
             '46451dbc3305d4c2e726a2f1943bddf697c5bb6815d93e5baed80bca82e53fdc'
             'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0'
             'a86a59d089ddd4f31565ff6a27ba74f4697ffa0ab0f57dc839e1da6ab83d77a4'
-            'e83c0dfa73fafb09b24a38e0c62767515177ae8e29eb511592f0af0083a08a97'
-            '0fbc4ce4428ac446752dc192709c21764018abf03046402ddd27409f2fac7172'
-            '8cac889e375641832fdc68eddd16e7c2febe0207cd117710d0d1876270afd4c7'
-            '36ad01102f1005d855c5e0c9d6b91e2b24654e7e971a32c1f3acb6a59bf4b270'
-            '32da7426bb107b29835ce45322ca40fb0c1c56f90574bec8e8fc9b94f5255220'
-            '5208324060bc7ac4d418a5503763f6f0f7e99c79b83216ebfde4ac778942bf66'
-            'fc655539835f8910841da651c46f4d709c6d82cf578066e0c5c25c0588228aee'
-            'ec8a7654fc9900923b85f2876e61e8bd7bffe9c8a85ee07b3cb7af47b01dc578'
-            '30c1656ae0776a769373eb3dca9587e398d5a05517bfa30a3c1573861ad4b155'
-            '96babd7c1ab75f4b5d2b512cbb105857242419ac1fc5bc41a207fd95a99f4b35'
-            '5376296a6c24bfdcb7f6f5f0eddb5dd9a12dedfbeb92d4fe6185828db9988494')
+            '9277f8bd1f8450edaf36ca124d5019520cf9c6f28513dc1dab1f7159be03dfb5'
+            '5ed15d63106e050c6aa92874fcb33b1f827702d42d4281a4b0366e2387f01a07'
+            '882313cbb296e62dec0d1780aad2c3086fc0fbba86438dd5cef0a1b9519a4224'
+            'fa3b984d08e4d764cb6df48d9cafe19284cce059e7856b0e860bce332e92890b'
+            '3dfd78e809b04a8f1374687f5be667a6275625b08f068a44470c3f2a8a37d4a1'
+            'c623b7ac173cdd19a537d0767b7b82b13f166a9705cad16896556e8b9f7d3c87'
+            'b6682cec5ea11cc06c27be8c3f0dc25f0168f28308e64c84d4c53f012d02f282'
+            '6bf774b0294488c01fc9392c69c355859d3fa7ea62127c3cb2f11cedf860e848'
+            '6c4dfefacd42c571bf53ddaf031566e44832ce87480c63553ddf149620e00e4e'
+            '242b8868d2a1c8a403e05c0da85f0dc48192ff22adad97e552b4213a19839676')
 
 prepare() {
   cd linux-${pkgver}