summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO30
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch2
-rw-r--r--0002-HID-core-fix-grouping-by-application.patch (renamed from 0003-HID-core-fix-grouping-by-application.patch)2
-rw-r--r--0002-drm-i915-Increase-LSPCON-timeout.patch50
-rw-r--r--0003-Arch-Linux-kernel-v4.18.7-arch1.patch (renamed from 0004-Arch-Linux-kernel-v4.18.7-arch1.patch)4
-rw-r--r--PKGBUILD18
6 files changed, 26 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5120b8bef02..32372eb130f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Sep 12 19:18:09 UTC 2018
+# Sat Sep 15 08:37:37 UTC 2018
pkgbase = linux-ck
- pkgver = 4.18.7
- pkgrel = 2
+ pkgver = 4.18.8
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -11,8 +11,8 @@ pkgbase = linux-ck
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.7.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.7.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.8.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.8.tar.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -21,10 +21,9 @@ pkgbase = linux-ck
source = http://ck.kolivas.org/patches/4.0/4.18/4.18-ck1/patch-4.18-ck1.xz
source = Fix_MuQSS_full_dynticks_build.patch::https://github.com/ckolivas/linux/commit/abb4fd30fa127a0e8178b975343eb01713bc2b18.patch
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- source = 0002-drm-i915-Increase-LSPCON-timeout.patch
- source = 0003-HID-core-fix-grouping-by-application.patch
- source = 0004-Arch-Linux-kernel-v4.18.7-arch1.patch
- sha256sums = f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731
+ source = 0002-HID-core-fix-grouping-by-application.patch
+ source = 0003-Arch-Linux-kernel-v4.18.7-arch1.patch
+ sha256sums = f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494
sha256sums = SKIP
sha256sums = a181ab290681e16b329775200357e7c04dcf8d6a5bc787d93feb5d763e892827
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -33,10 +32,9 @@ pkgbase = linux-ck
sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d
sha256sums = 0354083492adb3785dd31d2d4bf7dc805110aceffb369deed6cbded121f8a3d3
sha256sums = 6e1f3cc3eb9a1e30a69ef1999f9aa6ad7f2f9fe4af7ba5dabe25d4ff19ee6740
- sha256sums = b014187b6b9d3078c45b7c09b1ba1ccb315d69d73ccd4f59dc26fcbc50155409
- sha256sums = 947475d613b9912aec2b7bc600eb5f630e9e34095c8cc43e410a69848cce5a96
- sha256sums = dbd2603d608b74b920350a62279060b77fe6756e3913cec7c739a4106048a1ad
- sha256sums = 8ea37744879bc5a3d15ad4f1b267565baf23003e110dd68f0addf861bb2ac9d9
+ sha256sums = 8291c64db3068010b9663a343cccf1cd5ddb4db9eba481de7869d367cb06d93c
+ sha256sums = f2c3aafcd932f39d94b4b840158f9d01f6da6c2fbaca6b1ec055fb4e332c70bc
+ sha256sums = b625af571c7416e557831c425a754eb4bc1752b6ee253124be2c92f271ffc57f
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.173
@@ -46,12 +44,12 @@ pkgname = linux-ck
depends = kmod
depends = mkinitcpio
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-ck=4.18.7
+ provides = linux-ck=4.18.8
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
pkgdesc = Header files and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=4.18.7
- provides = linux-headers=4.18.7
+ provides = linux-ck-headers=4.18.8
+ provides = linux-headers=4.18.8
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 3d7840b91e11..b0e8c5815f49 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,7 +1,7 @@
From 288a921a8658bb478fe3c16120529fcd20f6d5d0 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/4] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
default
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/0003-HID-core-fix-grouping-by-application.patch b/0002-HID-core-fix-grouping-by-application.patch
index a1ecf420b779..a54c8a0d9b7d 100644
--- a/0003-HID-core-fix-grouping-by-application.patch
+++ b/0002-HID-core-fix-grouping-by-application.patch
@@ -1,7 +1,7 @@
From 2f2c07d184241b9f133ebe4498575a9f8cda6d1e Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Tue, 4 Sep 2018 15:31:14 +0200
-Subject: [PATCH 3/4] HID: core: fix grouping by application
+Subject: [PATCH 2/3] HID: core: fix grouping by application
commit f07b3c1da92d ("HID: generic: create one input report per
application type") was effectively the same as MULTI_INPUT:
diff --git a/0002-drm-i915-Increase-LSPCON-timeout.patch b/0002-drm-i915-Increase-LSPCON-timeout.patch
deleted file mode 100644
index e240317f3c81..000000000000
--- a/0002-drm-i915-Increase-LSPCON-timeout.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0f3ee1f4f0aaa3d2b5baf18e2932c21065f86845 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= <fredrikschon@gmail.com>
-Date: Fri, 17 Aug 2018 22:07:28 +0200
-Subject: [PATCH 2/4] drm/i915: Increase LSPCON timeout
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-100 ms is not enough time for the LSPCON adapter on Intel NUC devices to
-settle. This causes dropped display modes at boot or screen reconfiguration.
-Empirical testing can reproduce the error up to a timeout of 190 ms. Basic
-boot and stress testing at 200 ms has not (yet) failed.
-
-Increase timeout to 400 ms to get some margin of error.
-
-Changes from v1:
-The initial suggestion of 1000 ms was lowered due to concerns about delaying
-valid timeout cases.
-Update patch metadata.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107503
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1570392
-Fixes: 357c0ae9198a ("drm/i915/lspcon: Wait for expected LSPCON mode to settle")
-Cc: Shashank Sharma <shashank.sharma@intel.com>
-Cc: Imre Deak <imre.deak@intel.com>
-Cc: Jani Nikula <jani.nikula@intel.com>
-Cc: <stable@vger.kernel.org> # v4.11+
-Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Signed-off-by: Fredrik Schön <fredrik.schon@gmail.com>
-Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
----
- drivers/gpu/drm/i915/intel_lspcon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
-index 8ae8f42f430a..6b6758419fb3 100644
---- a/drivers/gpu/drm/i915/intel_lspcon.c
-+++ b/drivers/gpu/drm/i915/intel_lspcon.c
-@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
- DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
- lspcon_mode_name(mode));
-
-- wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
-+ wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400);
- if (current_mode != mode)
- DRM_ERROR("LSPCON mode hasn't settled\n");
-
---
-2.19.0
-
diff --git a/0004-Arch-Linux-kernel-v4.18.7-arch1.patch b/0003-Arch-Linux-kernel-v4.18.7-arch1.patch
index 1094b9916e95..34894b805e63 100644
--- a/0004-Arch-Linux-kernel-v4.18.7-arch1.patch
+++ b/0003-Arch-Linux-kernel-v4.18.7-arch1.patch
@@ -1,7 +1,7 @@
From 03875ed006ae4cac7d78a1b3af6d66aba16ebf71 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 9 Sep 2018 13:20:57 +0200
-Subject: [PATCH 4/4] Arch Linux kernel v4.18.7-arch1
+Subject: [PATCH 3/3] Arch Linux kernel v4.18.8-arch1
---
Makefile | 2 +-
@@ -14,7 +14,7 @@ index 711b04d00e49..52f76fab1dd6 100644
@@ -2,7 +2,7 @@
VERSION = 4
PATCHLEVEL = 18
- SUBLEVEL = 7
+ SUBLEVEL = 8
-EXTRAVERSION =
+EXTRAVERSION = -arch1
NAME = Merciless Moray
diff --git a/PKGBUILD b/PKGBUILD
index fa8e76f03c07..bac88432e468 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,9 +69,9 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-_srcver=4.18.7-arch1
+_srcver=4.18.8-arch1
pkgver=${_srcver%-*}
-pkgrel=2
+pkgrel=1
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -90,15 +90,14 @@ source=(
"http://ck.kolivas.org/patches/4.0/4.18/4.18-ck${_ckpatchversion}/${_ckpatchname}.xz"
Fix_MuQSS_full_dynticks_build.patch::https://github.com/ckolivas/linux/commit/abb4fd30fa127a0e8178b975343eb01713bc2b18.patch
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- 0002-drm-i915-Increase-LSPCON-timeout.patch
- 0003-HID-core-fix-grouping-by-application.patch
- 0004-Arch-Linux-kernel-v4.18.7-arch1.patch
+ 0002-HID-core-fix-grouping-by-application.patch
+ 0003-Arch-Linux-kernel-v4.18.7-arch1.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731'
+sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494'
'SKIP'
'a181ab290681e16b329775200357e7c04dcf8d6a5bc787d93feb5d763e892827'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -107,10 +106,9 @@ sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731'
'226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
'0354083492adb3785dd31d2d4bf7dc805110aceffb369deed6cbded121f8a3d3'
'6e1f3cc3eb9a1e30a69ef1999f9aa6ad7f2f9fe4af7ba5dabe25d4ff19ee6740'
- 'b014187b6b9d3078c45b7c09b1ba1ccb315d69d73ccd4f59dc26fcbc50155409'
- '947475d613b9912aec2b7bc600eb5f630e9e34095c8cc43e410a69848cce5a96'
- 'dbd2603d608b74b920350a62279060b77fe6756e3913cec7c739a4106048a1ad'
- '8ea37744879bc5a3d15ad4f1b267565baf23003e110dd68f0addf861bb2ac9d9')
+ '8291c64db3068010b9663a343cccf1cd5ddb4db9eba481de7869d367cb06d93c'
+ 'f2c3aafcd932f39d94b4b840158f9d01f6da6c2fbaca6b1ec055fb4e332c70bc'
+ 'b625af571c7416e557831c425a754eb4bc1752b6ee253124be2c92f271ffc57f')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}