Update to 6.0.6-1

10 files changed, 44 insertions, 279 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d869c109ee3..6d264df6dedd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.0.5
+	pkgver = 6.0.6
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -11,34 +11,32 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.5.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.5.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.sign
 	source = config
 	source = more-uarches-20221022.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221022.tar.gz
 	source = ck-hrtimer-5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz::https://github.com/graysky2/linux-patches/archive/5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
-	source = 0003-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch
-	source = 0004-soundwire-intel-Initialize-clock-stop-timeout.patch
-	source = 0005-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
-	source = 0006-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
-	source = 0007-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
-	source = 0008-drm-amdgpu-Fix-for-BO-move-issue.patch
+	source = 0003-soundwire-intel-Initialize-clock-stop-timeout.patch
+	source = 0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
+	source = 0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+	source = 0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
+	source = 0007-drm-amdgpu-Fix-for-BO-move-issue.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e
+	sha256sums = 864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa
 	sha256sums = SKIP
 	sha256sums = 05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6
 	sha256sums = 2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477
 	sha256sums = 85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b
-	sha256sums = 0579b6f69a528f25a49fd872c43a8352f8a6e6e1581fbfc626ae04d9789eb2fb
-	sha256sums = 38d0bf2d48ea454376eaca2af6b7dec285304b710eeccb44e82b0eb2b4359786
-	sha256sums = 095c5607059a98d764e8b26377587134521c47a12df66729736cedc41f6da017
-	sha256sums = 596e972f4c4fda1e830eb1dc6851a0d66a41cc504880f78cf32cb379aa6818ab
-	sha256sums = 22e15d9cc9b59da9febe0ea28c6d862828bb304160d310c83ce21934658fe80a
-	sha256sums = 0fa8801cbab408513d740b41e325498dd5468b5055e6e456daa727178d678b97
-	sha256sums = 530a4b74bc6df917c401a0a0b0c1658a8e9ee361b22b6cd56e1305858c190fb5
-	sha256sums = 322267bec409b46de82f1ed2b8e37cd5cd26bcd5e935f7f4581d21a48a6894e7
+	sha256sums = f1aafd32cd42e9ebb3475597db05bf27561ae52a7b48ec5bc353be3ca50925a1
+	sha256sums = 0a4ab2a5f7cf2cd78ca20678775f4ead39169bd7d7ba5e7ecae9053a9c94071b
+	sha256sums = ef1e125fb021ab64aeeda696408d6ed8232a4261a0a2489afc560350fc7312bc
+	sha256sums = feac2bd6fc4ee7c566975e09cb55bdc7be192988b037a0e79fd7e51f3f914221
+	sha256sums = 76052ea5929bac6b4fccc77b321cb273d6fca64426b7584fca5ff36a470d6eb1
+	sha256sums = e0e9dc4b1a0ea0fd1af0825c0b49844ea364e3163c4291b8712919f49914c4ef
+	sha256sums = 1487f13aa32de66562fca3b61e8c97c45c6f8dc2362403b141be2db423fcc3e1
 
 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 530ad3c7269c..04859f171911 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 0922a96b28a119abfefba8804a7958c17aff9a28 Mon Sep 17 00:00:00 2001
+From f29dd9ddc7a2659e67f7f3ddfbf087a7729fd012 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/9] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch b/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
index 47973d1a7a94..6b3bfd62a814 100644
--- a/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
+++ b/0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
@@ -1,7 +1,7 @@
-From 5a7d5bed48612de588ec0582c24faf3d5a4ad0b0 Mon Sep 17 00:00:00 2001
+From f4a5411651f402b391dddccdebc43e3461e9f749 Mon Sep 17 00:00:00 2001
 From: Johannes Weiner <hannes@cmpxchg.org>
 Date: Tue, 2 Aug 2022 12:28:11 -0400
-Subject: [PATCH 2/9] mm: vmscan: fix extreme overreclaim and swap floods
+Subject: [PATCH 2/8] mm: vmscan: fix extreme overreclaim and swap floods
 
 During proactive reclaim, we sometimes observe severe overreclaim, with
 several thousand times more pages reclaimed than requested.
diff --git a/0003-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch b/0003-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch
deleted file mode 100644
index 36d65dffc837..000000000000
--- a/0003-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From d8e3330b3698c49d50f5a411aafab8b176012621 Mon Sep 17 00:00:00 2001
-From: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
-Date: Mon, 4 Oct 2021 14:07:34 -0400
-Subject: [PATCH 3/9] Bluetooth: fix deadlock for RFCOMM sk state change
-
-Syzbot reports the following task hang [1]:
-
-INFO: task syz-executor255:8499 blocked for more than 143 seconds.
-      Not tainted 5.14.0-rc7-syzkaller #0
-
-Call Trace:
- context_switch kernel/sched/core.c:4681 [inline]
- __schedule+0x93a/0x26f0 kernel/sched/core.c:5938
- schedule+0xd3/0x270 kernel/sched/core.c:6017
- __lock_sock+0x13d/0x260 net/core/sock.c:2644
- lock_sock_nested+0xf6/0x120 net/core/sock.c:3185
- lock_sock include/net/sock.h:1612 [inline]
- rfcomm_sk_state_change+0xb4/0x390 net/bluetooth/rfcomm/sock.c:73
- __rfcomm_dlc_close+0x1b6/0x8a0 net/bluetooth/rfcomm/core.c:489
- rfcomm_dlc_close+0x1ea/0x240 net/bluetooth/rfcomm/core.c:520
- __rfcomm_sock_close+0xac/0x260 net/bluetooth/rfcomm/sock.c:220
- rfcomm_sock_shutdown+0xe9/0x210 net/bluetooth/rfcomm/sock.c:931
- rfcomm_sock_release+0x5f/0x140 net/bluetooth/rfcomm/sock.c:951
- __sock_release+0xcd/0x280 net/socket.c:649
- sock_close+0x18/0x20 net/socket.c:1314
- __fput+0x288/0x920 fs/file_table.c:280
- task_work_run+0xdd/0x1a0 kernel/task_work.c:164
- exit_task_work include/linux/task_work.h:32 [inline]
- do_exit+0xbd4/0x2a60 kernel/exit.c:825
- do_group_exit+0x125/0x310 kernel/exit.c:922
- get_signal+0x47f/0x2160 kernel/signal.c:2808
- arch_do_signal_or_restart+0x2a9/0x1c40 arch/x86/kernel/signal.c:865
- handle_signal_work kernel/entry/common.c:148 [inline]
- exit_to_user_mode_loop kernel/entry/common.c:172 [inline]
- exit_to_user_mode_prepare+0x17d/0x290 kernel/entry/common.c:209
- __syscall_exit_to_user_mode_work kernel/entry/common.c:291 [inline]
- syscall_exit_to_user_mode+0x19/0x60 kernel/entry/common.c:302
- do_syscall_64+0x42/0xb0 arch/x86/entry/common.c:86
- entry_SYSCALL_64_after_hwframe+0x44/0xae
-
-Showing all locks held in the system:
-1 lock held by khungtaskd/1653:
- #0: ffffffff8b97c280 (rcu_read_lock){....}-{1:2}, at:
- debug_show_all_locks+0x53/0x260 kernel/locking/lockdep.c:6446
-1 lock held by krfcommd/4781:
- #0: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_process_sessions net/bluetooth/rfcomm/core.c:1979 [inline]
- #0: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_run+0x2ed/0x4a20 net/bluetooth/rfcomm/core.c:2086
-2 locks held by in:imklog/8206:
- #0: ffff8880182ce5f0 (&f->f_pos_lock){+.+.}-{3:3}, at:
- __fdget_pos+0xe9/0x100 fs/file.c:974
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at:
- raw_spin_rq_lock_nested kernel/sched/core.c:460 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at: raw_spin_rq_lock
- kernel/sched/sched.h:1307 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at: rq_lock
- kernel/sched/sched.h:1610 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at:
- __schedule+0x233/0x26f0 kernel/sched/core.c:5852
-4 locks held by syz-executor255/8499:
- #0: ffff888039a83690 (&sb->s_type->i_mutex_key#13){+.+.}-{3:3}, at:
- inode_lock include/linux/fs.h:774 [inline]
- #0: ffff888039a83690 (&sb->s_type->i_mutex_key#13){+.+.}-{3:3}, at:
- __sock_release+0x86/0x280 net/socket.c:648
- #1:
- ffff88802fa31120 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0},
- at: lock_sock include/net/sock.h:1612 [inline]
- #1:
- ffff88802fa31120 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0},
- at: rfcomm_sock_shutdown+0x54/0x210 net/bluetooth/rfcomm/sock.c:928
- #2: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_dlc_close+0x34/0x240 net/bluetooth/rfcomm/core.c:507
- #3: ffff888141bd6d28 (&d->lock){+.+.}-{3:3}, at:
- __rfcomm_dlc_close+0x162/0x8a0 net/bluetooth/rfcomm/core.c:487
-==================================================================
-
-The task hangs because of a deadlock that occurs when lock_sock() is
-called in rfcomm_sk_state_change(). One such call stack is:
-
-  rfcomm_sock_shutdown():
-    lock_sock();
-    __rfcomm_sock_close():
-      rfcomm_dlc_close():
-        __rfcomm_dlc_close():
-          rfcomm_dlc_lock();
-          rfcomm_sk_state_change():
-            lock_sock();
-
-lock_sock() has to be called when the sk state is changed because the
-lock is not always held when rfcomm_sk_state_change() is
-called. However, besides the recursive deadlock, there is also an
-issue of a lock hierarchy inversion between rfcomm_dlc_lock() and
-lock_sock() if the socket is locked in rfcomm_sk_state_change().
-
-To avoid these issues, we can instead schedule the sk state change in
-the global workqueue. This is already the implicit assumption about
-how sk state changes happen. For example, in rfcomm_sock_shutdown(),
-the call to __rfcomm_sock_close() is followed by
-bt_sock_wait_state().
-
-Additionally, the call to rfcomm_sock_kill() inside
-rfcomm_sk_state_change() should be removed. The socket shouldn't be
-killed here because only rfcomm_sock_release() calls sock_orphan(),
-which it already follows up with a call to rfcomm_sock_kill().
-
-Fixes: b7ce436a5d79 ("Bluetooth: switch to lock_sock in RFCOMM")
-Link: https://syzkaller.appspot.com/bug?extid=7d51f807c81b190a127d [1]
-Reported-by: syzbot+7d51f807c81b190a127d@syzkaller.appspotmail.com
-Tested-by: syzbot+7d51f807c81b190a127d@syzkaller.appspotmail.com
-Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
-Cc: Hillf Danton <hdanton@sina.com>
----
- include/net/bluetooth/rfcomm.h |  3 +++
- net/bluetooth/rfcomm/core.c    |  2 ++
- net/bluetooth/rfcomm/sock.c    | 34 ++++++++++++++++++++++------------
- 3 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
-index 99d26879b02a..a92799fc5e74 100644
---- a/include/net/bluetooth/rfcomm.h
-+++ b/include/net/bluetooth/rfcomm.h
-@@ -171,6 +171,7 @@ struct rfcomm_dlc {
- 	struct rfcomm_session *session;
- 	struct sk_buff_head   tx_queue;
- 	struct timer_list     timer;
-+	struct work_struct    state_change_work;
- 
- 	struct mutex  lock;
- 	unsigned long state;
-@@ -186,6 +187,7 @@ struct rfcomm_dlc {
- 	u8            sec_level;
- 	u8            role_switch;
- 	u32           defer_setup;
-+	int           err;
- 
- 	uint          mtu;
- 	uint          cfc;
-@@ -310,6 +312,7 @@ struct rfcomm_pinfo {
- 	u8     role_switch;
- };
- 
-+void __rfcomm_sk_state_change(struct work_struct *work);
- int  rfcomm_init_sockets(void);
- void rfcomm_cleanup_sockets(void);
- 
-diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
-index 7324764384b6..c6494e85cd68 100644
---- a/net/bluetooth/rfcomm/core.c
-+++ b/net/bluetooth/rfcomm/core.c
-@@ -289,6 +289,7 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d)
- 	d->flags      = 0;
- 	d->mscex      = 0;
- 	d->sec_level  = BT_SECURITY_LOW;
-+	d->err        = 0;
- 	d->mtu        = RFCOMM_DEFAULT_MTU;
- 	d->v24_sig    = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV;
- 
-@@ -306,6 +307,7 @@ struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio)
- 	timer_setup(&d->timer, rfcomm_dlc_timeout, 0);
- 
- 	skb_queue_head_init(&d->tx_queue);
-+	INIT_WORK(&d->state_change_work, __rfcomm_sk_state_change);
- 	mutex_init(&d->lock);
- 	refcount_set(&d->refcnt, 1);
- 
-diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 21e24da4847f..559604dd0d65 100644
---- a/net/bluetooth/rfcomm/sock.c
-+++ b/net/bluetooth/rfcomm/sock.c
-@@ -61,19 +61,22 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb)
- 		rfcomm_dlc_throttle(d);
- }
- 
--static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
-+void __rfcomm_sk_state_change(struct work_struct *work)
- {
-+	struct rfcomm_dlc *d = container_of(work, struct rfcomm_dlc,
-+					    state_change_work);
- 	struct sock *sk = d->owner, *parent;
- 
- 	if (!sk)
- 		return;
- 
--	BT_DBG("dlc %p state %ld err %d", d, d->state, err);
--
- 	lock_sock(sk);
-+	rfcomm_dlc_lock(d);
- 
--	if (err)
--		sk->sk_err = err;
-+	BT_DBG("dlc %p state %ld err %d", d, d->state, d->err);
-+
-+	if (d->err)
-+		sk->sk_err = d->err;
- 
- 	sk->sk_state = d->state;
- 
-@@ -91,15 +94,22 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
- 		sk->sk_state_change(sk);
- 	}
- 
-+	rfcomm_dlc_unlock(d);
- 	release_sock(sk);
-+	sock_put(sk);
-+}
- 
--	if (parent && sock_flag(sk, SOCK_ZAPPED)) {
--		/* We have to drop DLC lock here, otherwise
--		 * rfcomm_sock_destruct() will dead lock. */
--		rfcomm_dlc_unlock(d);
--		rfcomm_sock_kill(sk);
--		rfcomm_dlc_lock(d);
--	}
-+static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
-+{
-+	struct sock *sk = d->owner;
-+
-+	if (!sk)
-+		return;
-+
-+	d->err = err;
-+	sock_hold(sk);
-+	if (!schedule_work(&d->state_change_work))
-+		sock_put(sk);
- }
- 
- /* ---- Socket functions ---- */
--- 
-2.38.1
-
diff --git a/0004-soundwire-intel-Initialize-clock-stop-timeout.patch b/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
index 9edd7106177a..c00810efbbfb 100644
--- a/0004-soundwire-intel-Initialize-clock-stop-timeout.patch
+++ b/0003-soundwire-intel-Initialize-clock-stop-timeout.patch
@@ -1,7 +1,7 @@
-From fb23dad87a0bfb6fdfde3dc1d18104da631d050a Mon Sep 17 00:00:00 2001
+From f4e799545c0fc46a5899853f60776adc8671776c Mon Sep 17 00:00:00 2001
 From: Sjoerd Simons <sjoerd@collabora.com>
 Date: Sat, 8 Oct 2022 21:57:51 +0200
-Subject: [PATCH 4/9] soundwire: intel: Initialize clock stop timeout
+Subject: [PATCH 3/8] soundwire: intel: Initialize clock stop timeout
 
 The bus->clk_stop_timeout member is only initialized to a non-zero value
 during the codec driver probe. This can lead to corner cases where this
diff --git a/0005-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch b/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
index 1d9f5e94cfcf..738c8e04808d 100644
--- a/0005-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
+++ b/0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
@@ -1,7 +1,7 @@
-From 64ebb671ffc4cbfd548e4f1b4aeb98155fd386dc Mon Sep 17 00:00:00 2001
+From 87336625589872206597baab173ae6014ddf1750 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
 Date: Fri, 7 Oct 2022 09:51:13 +0200
-Subject: [PATCH 5/9] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
+Subject: [PATCH 4/8] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0006-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch b/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
index e3a63a93305b..e27774e75146 100644
--- a/0006-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+++ b/0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
@@ -1,7 +1,7 @@
-From a24b69f369c6c55be8ce40427feb4e127afae129 Mon Sep 17 00:00:00 2001
+From 2b078fa1fdcbd43a042ff49ad70f6ab2a22dffb3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
 Date: Fri, 7 Oct 2022 10:59:58 +0200
-Subject: [PATCH 6/9] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
+Subject: [PATCH 5/8] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
  updates
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/0007-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch b/0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
index 23f937f711a6..f58574f1ef42 100644
--- a/0007-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
+++ b/0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
@@ -1,7 +1,7 @@
-From 785699dbc7041b99e0027bff27ffe17eba202e96 Mon Sep 17 00:00:00 2001
+From f2712d9d94e98733953cf567f32f7755800464ae Mon Sep 17 00:00:00 2001
 From: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
 Date: Tue, 4 Oct 2022 07:33:39 -0700
-Subject: [PATCH 7/9] drm/amdgpu: Fix VRAM BO swap issue
+Subject: [PATCH 6/8] drm/amdgpu: Fix VRAM BO swap issue
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0008-drm-amdgpu-Fix-for-BO-move-issue.patch b/0007-drm-amdgpu-Fix-for-BO-move-issue.patch
index 0c78748e2f3f..5543dc51436e 100644
--- a/0008-drm-amdgpu-Fix-for-BO-move-issue.patch
+++ b/0007-drm-amdgpu-Fix-for-BO-move-issue.patch
@@ -1,7 +1,7 @@
-From 6df3912f64cea68409b08d282ffbccf0af7f8d8e Mon Sep 17 00:00:00 2001
+From 75ff02c24828d71bf13730e1a0b499591a1a4cef Mon Sep 17 00:00:00 2001
 From: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
 Date: Mon, 17 Oct 2022 13:15:21 -0700
-Subject: [PATCH 8/9] drm/amdgpu: Fix for BO move issue
+Subject: [PATCH 7/8] drm/amdgpu: Fix for BO move issue
 
 If there are no blocks to compare then exit
 the loop.
diff --git a/PKGBUILD b/PKGBUILD
index d5b40eeba900..f80ad838e0aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,7 +68,7 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.0.5
+pkgver=6.0.6
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -92,30 +92,28 @@ source=(
   "ck-hrtimer-$_commit.tar.gz::https://github.com/graysky2/linux-patches/archive/$_commit.tar.gz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
-  0003-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch
-  0004-soundwire-intel-Initialize-clock-stop-timeout.patch
-  0005-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
-  0006-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
-  0007-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
-  0008-drm-amdgpu-Fix-for-BO-move-issue.patch
+  0003-soundwire-intel-Initialize-clock-stop-timeout.patch
+  0004-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
+  0005-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
+  0006-drm-amdgpu-Fix-VRAM-BO-swap-issue.patch
+  0007-drm-amdgpu-Fix-for-BO-move-issue.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e'
+sha256sums=('864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa'
             'SKIP'
             '05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6'
             '2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477'
             '85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b'
-            '0579b6f69a528f25a49fd872c43a8352f8a6e6e1581fbfc626ae04d9789eb2fb'
-            '38d0bf2d48ea454376eaca2af6b7dec285304b710eeccb44e82b0eb2b4359786'
-            '095c5607059a98d764e8b26377587134521c47a12df66729736cedc41f6da017'
-            '596e972f4c4fda1e830eb1dc6851a0d66a41cc504880f78cf32cb379aa6818ab'
-            '22e15d9cc9b59da9febe0ea28c6d862828bb304160d310c83ce21934658fe80a'
-            '0fa8801cbab408513d740b41e325498dd5468b5055e6e456daa727178d678b97'
-            '530a4b74bc6df917c401a0a0b0c1658a8e9ee361b22b6cd56e1305858c190fb5'
-            '322267bec409b46de82f1ed2b8e37cd5cd26bcd5e935f7f4581d21a48a6894e7')
+            'f1aafd32cd42e9ebb3475597db05bf27561ae52a7b48ec5bc353be3ca50925a1'
+            '0a4ab2a5f7cf2cd78ca20678775f4ead39169bd7d7ba5e7ecae9053a9c94071b'
+            'ef1e125fb021ab64aeeda696408d6ed8232a4261a0a2489afc560350fc7312bc'
+            'feac2bd6fc4ee7c566975e09cb55bdc7be192988b037a0e79fd7e51f3f914221'
+            '76052ea5929bac6b4fccc77b321cb273d6fca64426b7584fca5ff36a470d6eb1'
+            'e0e9dc4b1a0ea0fd1af0825c0b49844ea364e3163c4291b8712919f49914c4ef'
+            '1487f13aa32de66562fca3b61e8c97c45c6f8dc2362403b141be2db423fcc3e1')
 
 prepare() {
   cd linux-${pkgver}