Update to 6.0.9-1

3 files changed, 8 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 098e6779335f..30f7d394c89e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.0.8
+	pkgver = 6.0.9
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.8.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.8.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.9.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.9.tar.sign
 	source = config
 	source = more-uarches-20221104.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221104.tar.gz
 	source = ck-hrtimer-5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz::https://github.com/graysky2/linux-patches/archive/5be918e798e2c2cc94fa7dd0f6f031921a4f7598.tar.gz
@@ -21,10 +21,9 @@ pkgbase = linux-ck
 	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-the-lpfn-checking-condition-in-drm-bu.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257
+	sha256sums = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
 	sha256sums = SKIP
 	sha256sums = 05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6
 	sha256sums = 3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed
@@ -34,7 +33,6 @@ pkgbase = linux-ck
 	sha256sums = 757cb209f1b1759f4c9efcc77501be9ee73676db069d0440104255ab35c4cdd0
 	sha256sums = a3ffe9f133029d60bf8fa66775cee64e160ddf33c265e7807eb3dea7d1981ac4
 	sha256sums = 26669e4925ac1869eeb53a7d9578c8af742c6a7e8cdcdb9af2c081774581a032
-	sha256sums = e5f5ebed349af1a95c9c8360fbe07d78ec4dff11cd7a228e436cf21e6409ebe9
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
diff --git a/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch b/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
deleted file mode 100644
index f841f327d94d..000000000000
--- a/0006-drm-amdgpu-Fix-the-lpfn-checking-condition-in-drm-bu.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From abb7ab2ef180b3d934e779f805bacd53b6c6e76d Mon Sep 17 00:00:00 2001
-From: Ma Jun <Jun.Ma2@amd.com>
-Date: Wed, 14 Sep 2022 20:53:31 +0800
-Subject: [PATCH 6/7] drm/amdgpu: Fix the lpfn checking condition in drm buddy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Because the value of man->size is changed during suspend/resume process,
-use mgr->mm.size instead of man->size here for lpfn checking.
-
-Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
-Suggested-by: Christian König <christian.koenig@amd.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20220914125331.2467162-1-Jun.Ma2@amd.com
-Signed-off-by: Christian König <christian.koenig@amd.com>
-For: https://bugs.archlinux.org/task/76198
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
-index 28ec5f8ac1c1..27159f1d112e 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
-@@ -435,7 +435,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
- 	if (place->flags & TTM_PL_FLAG_TOPDOWN)
- 		vres->flags |= DRM_BUDDY_TOPDOWN_ALLOCATION;
- 
--	if (fpfn || lpfn != man->size)
-+	if (fpfn || lpfn != mgr->mm.size)
- 		/* Allocate blocks in desired range */
- 		vres->flags |= DRM_BUDDY_RANGE_ALLOCATION;
- 
--- 
-2.38.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 9be97e08bc47..46afd5e6cbc2 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.8
+pkgver=6.0.9
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -95,13 +95,12 @@ source=(
   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-the-lpfn-checking-condition-in-drm-bu.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257'
+sha256sums=('6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7'
             'SKIP'
             '05168cbbeb6378eec6c84fe3300cede4fa5cf6130c39fb8af95040529bd390a6'
             '3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed'
@@ -110,8 +109,7 @@ sha256sums=('0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257'
             'b9a998b084cd583dac4cc755aab79e8810013c4c0d6d9f5e4fa78d2939314ced'
             '757cb209f1b1759f4c9efcc77501be9ee73676db069d0440104255ab35c4cdd0'
             'a3ffe9f133029d60bf8fa66775cee64e160ddf33c265e7807eb3dea7d1981ac4'
-            '26669e4925ac1869eeb53a7d9578c8af742c6a7e8cdcdb9af2c081774581a032'
-            'e5f5ebed349af1a95c9c8360fbe07d78ec4dff11cd7a228e436cf21e6409ebe9')
+            '26669e4925ac1869eeb53a7d9578c8af742c6a7e8cdcdb9af2c081774581a032')
 
 prepare() {
   cd linux-${pkgver}
@@ -315,7 +313,7 @@ _package-headers() {
   echo "Stripping build tools..."
   local file
   while read -rd '' file; do
-    case "$(file -bi "$file")" in
+    case "$(file -Sbi "$file")" in
       application/x-sharedlib\;*)      # Libraries (.so)
         strip -v $STRIP_SHARED "$file" ;;
       application/x-archive\;*)        # Libraries (.a)