summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-04-22 10:08:25 +0300
committerAqua-sama <aqua@iserlohn-fortress.net>2020-04-22 10:08:25 +0300
commitba2f0a1b3c128fa53a29425406fdca3c3c9bb98e (patch)
tree657930e9e906eb5239a5bcbd5431e0f234aadd2e
parentRemove obsolete patch (diff)
parentUpdated to 5.5.19 (diff)
downloadlinux-ck-5.5.tar.xz
Merge branch 'upstream'5.5
-rw-r--r--0004-drm_i915_Serialise_i915_active_acquire_with__active_retire.patch (renamed from 0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch)0
-rw-r--r--0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch (renamed from 0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch)0
-rw-r--r--PKGBUILD12
3 files changed, 6 insertions, 6 deletions
diff --git a/0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch b/0004-drm_i915_Serialise_i915_active_acquire_with__active_retire.patch
index 937adac..937adac 100644
--- a/0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch
+++ b/0004-drm_i915_Serialise_i915_active_acquire_with__active_retire.patch
diff --git a/0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch b/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
index 9887e67..9887e67 100644
--- a/0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+++ b/0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
diff --git a/PKGBUILD b/PKGBUILD
index 1c93c71..c110922 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
pkgbase=linux-ck
_supver=5
_majver=5
-_minver=18
+_minver=19
_gccpatchver='20191217'
_gccpatchger='9.1'
_gccpatchker='5.5'
@@ -46,9 +46,9 @@ source=(
zfs.patch
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- 0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch
+ 0004-drm_i915_Serialise_i915_active_acquire_with__active_retire.patch
0005-drm_i915_gem_Take_runtime-pm_wakeref_prior_to_unbinding.patch
- 0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+ 0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
0008-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch
0009-drm-i915-Add-a-simple-is-bound-check-before-unbinding.patch
@@ -66,7 +66,7 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('b30d52ddb7833e61d6ac84b97e3bde362992b3bb4fca307acfdafd01d703654dafa48c8bdc38c6821e82e139cefff8e699c31da6832af37a77cd574d63475e3b'
+b2sums=('cd30a600a2b9ecd3f26ff994fa54871a0fabb24ca1db70b0657732fffcc9c77e9aaf14ab440b2544b77744ea0a8c325de47dbe01e8df54cc47880d38343ac1e9'
'SKIP'
'4b982e16e3fee2c2c40db08d67a6cc794c27308c4b513a9baf909c5ea40e3be239288ba4c422e8eb58a669646d331e7fd945d7451d1a388f1c68fe3a445aa814'
'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e'
@@ -104,9 +104,9 @@ prepare() {
echo "Applying hotfixes"
patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
patch -p1 -i ../0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- patch -p1 -i ../0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch
+ patch -p1 -i ../0004-drm_i915_Serialise_i915_active_acquire_with__active_retire.patch
patch -p1 -i ../0005-drm_i915_gem_Take_runtime-pm_wakeref_prior_to_unbinding.patch
- patch -p1 -i ../0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch
+ patch -p1 -i ../0006-drm-i915-gem-Avoid-parking-the-vma-as-we-unbind.patch
patch -p1 -i ../0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
patch -p1 -i ../0008-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch
patch -p1 -i ../0009-drm-i915-Add-a-simple-is-bound-check-before-unbinding.patch