Update to 6.0.5-1

4 files changed, 17 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ae69b02ef35..6d869c109ee3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ck
-	pkgver = 6.0.3
-	pkgrel = 2
+	pkgver = 6.0.5
+	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
@@ -11,10 +11,10 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.sign
+	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 = config
-	source = more-uarches-20220315.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20220315.tar.gz
+	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
@@ -24,13 +24,12 @@ pkgbase = linux-ck
 	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 = 0009-Revert-ALSA-hda-Fix-page-fault-in-snd_hda_codec_shut.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf
+	sha256sums = 61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e
 	sha256sums = SKIP
-	sha256sums = 9764b52d6b79378124755ba6926104ed4d0cf079e7e1b7eafb7a99406f747fb5
-	sha256sums = 5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c
+	sha256sums = 05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6
+	sha256sums = 2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477
 	sha256sums = 85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b
 	sha256sums = 0579b6f69a528f25a49fd872c43a8352f8a6e6e1581fbfc626ae04d9789eb2fb
 	sha256sums = 38d0bf2d48ea454376eaca2af6b7dec285304b710eeccb44e82b0eb2b4359786
@@ -40,7 +39,6 @@ pkgbase = linux-ck
 	sha256sums = 0fa8801cbab408513d740b41e325498dd5468b5055e6e456daa727178d678b97
 	sha256sums = 530a4b74bc6df917c401a0a0b0c1658a8e9ee361b22b6cd56e1305858c190fb5
 	sha256sums = 322267bec409b46de82f1ed2b8e37cd5cd26bcd5e935f7f4581d21a48a6894e7
-	sha256sums = 55947d864c380b47a0306b5701c8d1a988dbbbb12515e65159cd14a231b93de2
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
diff --git a/0009-Revert-ALSA-hda-Fix-page-fault-in-snd_hda_codec_shut.patch b/0009-Revert-ALSA-hda-Fix-page-fault-in-snd_hda_codec_shut.patch
deleted file mode 100644
index c1724689a3d1..000000000000
--- a/0009-Revert-ALSA-hda-Fix-page-fault-in-snd_hda_codec_shut.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 41d72c232237c5ea567cf789add1092114f21216 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Sat, 22 Oct 2022 01:48:17 +0200
-Subject: [PATCH 09/10] Revert "ALSA: hda: Fix page fault in
- snd_hda_codec_shutdown()"
-
-This reverts commit 7494e2e6c55ed192f2b91c821fd6832744ba8741.
-
-This patch depends on others from its series, which were not
-backported, causing probing to fail due to missing initialization.
-
-See: https://github.com/thesofproject/linux/issues/3764
----
- sound/pci/hda/hda_codec.c | 41 ++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index 4ae8b9574778..384426d7e9dd 100644
---- a/sound/pci/hda/hda_codec.c
-+++ b/sound/pci/hda/hda_codec.c
-@@ -931,28 +931,8 @@ snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr,
- 	}
- 
- 	codec->bus = bus;
--	codec->depop_delay = -1;
--	codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
--	codec->core.dev.release = snd_hda_codec_dev_release;
--	codec->core.exec_verb = codec_exec_verb;
- 	codec->core.type = HDA_DEV_LEGACY;
- 
--	mutex_init(&codec->spdif_mutex);
--	mutex_init(&codec->control_mutex);
--	snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
--	snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32);
--	snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
--	snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
--	snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8);
--	snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16);
--	snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16);
--	snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8);
--	INIT_LIST_HEAD(&codec->conn_list);
--	INIT_LIST_HEAD(&codec->pcm_list_head);
--	INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
--	refcount_set(&codec->pcm_ref, 1);
--	init_waitqueue_head(&codec->remove_sleep);
--
- 	return codec;
- }
- EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);
-@@ -1005,8 +985,29 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
- 	if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
- 		return -EINVAL;
- 
-+	codec->core.dev.release = snd_hda_codec_dev_release;
-+	codec->core.exec_verb = codec_exec_verb;
-+
- 	codec->card = card;
- 	codec->addr = codec_addr;
-+	mutex_init(&codec->spdif_mutex);
-+	mutex_init(&codec->control_mutex);
-+	snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
-+	snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32);
-+	snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
-+	snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
-+	snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8);
-+	snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16);
-+	snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16);
-+	snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8);
-+	INIT_LIST_HEAD(&codec->conn_list);
-+	INIT_LIST_HEAD(&codec->pcm_list_head);
-+	refcount_set(&codec->pcm_ref, 1);
-+	init_waitqueue_head(&codec->remove_sleep);
-+
-+	INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
-+	codec->depop_delay = -1;
-+	codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
- 
- #ifdef CONFIG_PM
- 	codec->power_jiffies = jiffies;
--- 
-2.38.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d6427f5dd161..d5b40eeba900 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,8 +68,8 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.0.3
-pkgrel=2
+pkgver=6.0.5
+pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
 license=(GPL2)
@@ -84,7 +84,7 @@ options=('!strip')
 _ckhrtimer=linux-6.0.y
 _commit=5be918e798e2c2cc94fa7dd0f6f031921a4f7598
 
-_gcc_more_v=20220315
+_gcc_more_v=20221022
 source=(
   "https://www.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar".{xz,sign}
   config         # the main kernel config file
@@ -98,16 +98,15 @@ source=(
   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
-  0009-Revert-ALSA-hda-Fix-page-fault-in-snd_hda_codec_shut.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf'
+sha256sums=('61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e'
             'SKIP'
-            '9764b52d6b79378124755ba6926104ed4d0cf079e7e1b7eafb7a99406f747fb5'
-            '5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c'
+            '05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6'
+            '2d50a108a111a7f135f91b2676539d0a163e38ee72874d091aed0e1e86f2d477'
             '85b197dbe033264925b4803b3c8907ed73b967061c098e269eacd5575d6da34b'
             '0579b6f69a528f25a49fd872c43a8352f8a6e6e1581fbfc626ae04d9789eb2fb'
             '38d0bf2d48ea454376eaca2af6b7dec285304b710eeccb44e82b0eb2b4359786'
@@ -116,8 +115,7 @@ sha256sums=('b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf'
             '22e15d9cc9b59da9febe0ea28c6d862828bb304160d310c83ce21934658fe80a'
             '0fa8801cbab408513d740b41e325498dd5468b5055e6e456daa727178d678b97'
             '530a4b74bc6df917c401a0a0b0c1658a8e9ee361b22b6cd56e1305858c190fb5'
-            '322267bec409b46de82f1ed2b8e37cd5cd26bcd5e935f7f4581d21a48a6894e7'
-            '55947d864c380b47a0306b5701c8d1a988dbbbb12515e65159cd14a231b93de2')
+            '322267bec409b46de82f1ed2b8e37cd5cd26bcd5e935f7f4581d21a48a6894e7')
 
 prepare() {
   cd linux-${pkgver}
diff --git a/config b/config
index e9709e2eccad..ffc1c82956a6 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.0.3-arch2 Kernel Configuration
+# Linux/x86 6.0.5-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=123
+CONFIG_PAHOLE_VERSION=124
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y