Update to 5.5.18-1

3 files changed, 9 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b4301ca09ea..049b14985b88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 5.5.17
+	pkgver = 5.5.18
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -8,14 +8,13 @@ pkgbase = linux-ck
 	makedepends = kmod
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.17.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.17.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.18.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.18.tar.sign
 	source = config
 	source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz
 	source = http://ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patch-5.5-ck1.xz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-	source = 0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
 	source = 0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 	source = 0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
 	source = 0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
@@ -25,14 +24,13 @@ pkgbase = linux-ck
 	source = 0010-drm-i915-Introduce-a-vma.kref.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 40dab59ec83470bc321aeaed18ca49ca51ece088d1c3649891ed1fa53d855819
+	sha256sums = e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106
 	sha256sums = SKIP
 	sha256sums = 0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06
 	sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5
 	sha256sums = 37a9d61e8a0b5a73992e1397c3a9cc947d39e715f205f3c665eb157b96d58f98
 	sha256sums = 62b087dd679e096a18611648308c05c896c587b488631fef4df51524dc4d2b6c
 	sha256sums = ab9b3259ca838688a02beb37df3ba0d058b3b3847b703e99352b193a1be961e6
-	sha256sums = 32c0ca29f46c7335ed8f7c2052ee1eccc88287d88680e7d4d1a6104134abf5a2
 	sha256sums = 2dfd1fc8c6115a7633dca86df1098cc55e6401ec7cbee1c2d0f1cbcfa1d7bf78
 	sha256sums = ef83a35e3516b456923be416606ccabfd05abe8ca587007a2fc00001c609ecca
 	sha256sums = d8cb6bf029d5a3729149bdd6fb88b4d57691d37baf4e6d280283197693c82f24
@@ -48,11 +46,11 @@ pkgname = linux-ck
 	depends = initramfs
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = linux-firmware: firmware images needed for some devices
-	provides = linux-ck=5.5.17
+	provides = linux-ck=5.5.18
 
 pkgname = linux-ck-headers
 	pkgdesc = Headers and scripts for building modules for Linux-ck kernel
 	depends = linux-ck
-	provides = linux-ck-headers=5.5.17
-	provides = linux-headers=5.5.17
+	provides = linux-ck-headers=5.5.18
+	provides = linux-headers=5.5.18
 
diff --git a/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch b/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
deleted file mode 100644
index f7c14132e3f8..000000000000
--- a/0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7e8f0d17203665f1e6cb110ecbfc90e9ebed8c28 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 2 Feb 2020 17:16:31 +0000
-Subject: [PATCH 03/13] drm: Remove PageReserved manipulation from
- drm_pci_alloc
-
-drm_pci_alloc/drm_pci_free are very thin wrappers around the core dma
-facilities, and we have no special reason within the drm layer to behave
-differently. In particular, since
-
-commit de09d31dd38a50fdce106c15abd68432eebbd014
-Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
-Date:   Fri Jan 15 16:51:42 2016 -0800
-
-    page-flags: define PG_reserved behavior on compound pages
-
-    As far as I can see there's no users of PG_reserved on compound pages.
-    Let's use PF_NO_COMPOUND here.
-
-it has been illegal to combine GFP_COMP with SetPageReserved, so lets
-stop doing both and leave the dma layer to its own devices.
-
-Reported-by: Taketo Kabe
-Bug: https://gitlab.freedesktop.org/drm/intel/issues/1027
-Fixes: de09d31dd38a ("page-flags: define PG_reserved behavior on compound pages")
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: <stable@vger.kernel.org> # v4.5+
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20200202171635.4039044-1-chris@chris-wilson.co.uk
----
- drivers/gpu/drm/drm_pci.c | 23 ++---------------------
- 1 file changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
-index a86a3ab2771c..235729f4aadb 100644
---- a/drivers/gpu/drm/drm_pci.c
-+++ b/drivers/gpu/drm/drm_pci.c
-@@ -51,8 +51,6 @@
- drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
- {
- 	drm_dma_handle_t *dmah;
--	unsigned long addr;
--	size_t sz;
- 
- 	/* pci_alloc_consistent only guarantees alignment to the smallest
- 	 * PAGE_SIZE order which is greater than or equal to the requested size.
-@@ -68,20 +66,13 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
- 	dmah->size = size;
- 	dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size,
- 					 &dmah->busaddr,
--					 GFP_KERNEL | __GFP_COMP);
-+					 GFP_KERNEL);
- 
- 	if (dmah->vaddr == NULL) {
- 		kfree(dmah);
- 		return NULL;
- 	}
- 
--	/* XXX - Is virt_to_page() legal for consistent mem? */
--	/* Reserve */
--	for (addr = (unsigned long)dmah->vaddr, sz = size;
--	     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
--		SetPageReserved(virt_to_page((void *)addr));
--	}
--
- 	return dmah;
- }
- 
-@@ -94,19 +85,9 @@ EXPORT_SYMBOL(drm_pci_alloc);
-  */
- void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
- {
--	unsigned long addr;
--	size_t sz;
--
--	if (dmah->vaddr) {
--		/* XXX - Is virt_to_page() legal for consistent mem? */
--		/* Unreserve */
--		for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
--		     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
--			ClearPageReserved(virt_to_page((void *)addr));
--		}
-+	if (dmah->vaddr)
- 		dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
- 				  dmah->busaddr);
--	}
- }
- 
- /**
--- 
-2.26.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 3e7b1191170a..402d350aa790 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,7 +61,7 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-ck
-pkgver=5.5.17
+pkgver=5.5.18
 pkgrel=1
 _ckpatchversion=1
 arch=(x86_64)
@@ -80,7 +80,6 @@ source=(
   "http://ck.kolivas.org/patches/5.0/5.5/5.5-ck${_ckpatchversion}/$_ckpatch.xz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
 0004-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 0005-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
 0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
@@ -93,14 +92,13 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('40dab59ec83470bc321aeaed18ca49ca51ece088d1c3649891ed1fa53d855819'
+sha256sums=('e804347326d707a68720a16d71426cf037a355ea8a8bb28c2fcc7bdd088e3106'
             'SKIP'
             '0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06'
             '7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5'
             '37a9d61e8a0b5a73992e1397c3a9cc947d39e715f205f3c665eb157b96d58f98'
             '62b087dd679e096a18611648308c05c896c587b488631fef4df51524dc4d2b6c'
             'ab9b3259ca838688a02beb37df3ba0d058b3b3847b703e99352b193a1be961e6'
-            '32c0ca29f46c7335ed8f7c2052ee1eccc88287d88680e7d4d1a6104134abf5a2'
             '2dfd1fc8c6115a7633dca86df1098cc55e6401ec7cbee1c2d0f1cbcfa1d7bf78'
             'ef83a35e3516b456923be416606ccabfd05abe8ca587007a2fc00001c609ecca'
             'd8cb6bf029d5a3729149bdd6fb88b4d57691d37baf4e6d280283197693c82f24'