summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch6
-rw-r--r--0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch6
-rw-r--r--PKGBUILD12
-rw-r--r--config2
5 files changed, 19 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 368ca9c54200..39e73b51e32b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.10.14
+ pkgver = 5.10.15
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -12,24 +12,22 @@ pkgbase = linux-ck
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.14.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.14.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.15.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.15.tar.sign
source = config
source = enable_additional_cpu_optimizations-20201113.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20201113.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.10/5.10-ck1/patch-5.10-ck1.xz
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
- source = 0003-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch::https://github.com/torvalds/linux/commit/bad4c6eb5eaa8300e065bd4426727db5141d687d.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 34ba86c15532eff73ed3cd5d34bb125a534776425a98c43ceff187a9f950c4a12afbe35c5e63306150cdeff5d4e43c5094182d6533381661fe6e5ce82aeaed16
+ b2sums = 7cf58513bf2266697843f6d91fbb214268ad511e110a4e2b66bc0db84ecb4df724a7d65f641eee5837f4d88c1371ec8b313ee8aaa1d1f0260709eae2e3af32b3
b2sums = SKIP
- b2sums = 23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572
+ b2sums = 74b6ea3f314aa8291c9e2c3b5763f9b0c8aabbc0e714e30529f557955a7a315b44b0cd2f2d665ffe3ba48e7df71274c5901d3891ed395191ceb6ca88f69cdb1a
b2sums = 7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127
b2sums = 067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a
- b2sums = de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc
- b2sums = 9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327
- b2sums = d6bb0e91f5a5d263648b73aacf4e8aa4a7148daee887017a3a8b67ecfda1c3b592a14eeb2ee405535c9bd509c1318a99ab69651a00e62d55a7c8da6fa2b28fa5
+ b2sums = 99474f274431a7491ffc1a2b7fd20aad76699c0a9b442b8ce3459bade402ec002e4b67a40e1cc8b802752add70ee6ce77cc8055b8f4c2d81adfcd001d8a2eb13
+ b2sums = 3264190050a0cac1b63057c08dbcf07d351a370b08eccc70122e44a935e7e41f64fbb7444e986773266d69c3f6354d3c2e49282d6308dca4ec24a92dc93ff917
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index f42db251c6a8..63e8af92554c 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From e423c96b9ffbcb29898ea62a532ba0ef3d8a674f Mon Sep 17 00:00:00 2001
+From 024a28765039cafbd4b4056d3f213be989e39dc2 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -150,5 +150,5 @@ index e703d5d9cbe8..5758274feaee 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.30.0
+2.30.1
diff --git a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
index db8db5d7c5ed..880eb8f3aff1 100644
--- a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+++ b/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
@@ -1,7 +1,7 @@
-From 91331053326444b5c3efb7cf80a0421f27a2dfc4 Mon Sep 17 00:00:00 2001
+From 53b53f6df0d94a034c14eb65d9b925832c22159d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
Date: Thu, 19 Nov 2020 09:22:32 +0100
-Subject: [PATCH 2/5] HID: quirks: Add Apple Magic Trackpad 2 to
+Subject: [PATCH 2/3] HID: quirks: Add Apple Magic Trackpad 2 to
hid_have_special_driver list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -32,5 +32,5 @@ index bf7ecab5d9e5..142e9dae2837 100644
#if IS_ENABLED(CONFIG_HID_MAYFLASH)
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
--
-2.30.0
+2.30.1
diff --git a/PKGBUILD b/PKGBUILD
index 6e92ac6de76b..a4ea43fbb026 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,7 +64,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.10.14
+pkgver=5.10.15
pkgrel=1
_ckpatchversion=1
arch=(x86_64)
@@ -83,20 +83,18 @@ source=(
"http://ck.kolivas.org/patches/5.0/5.10/5.10-ck${_ckpatchversion}/$_ckpatch.xz"
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
- 0003-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch::https://github.com/torvalds/linux/commit/bad4c6eb5eaa8300e065bd4426727db5141d687d.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('34ba86c15532eff73ed3cd5d34bb125a534776425a98c43ceff187a9f950c4a12afbe35c5e63306150cdeff5d4e43c5094182d6533381661fe6e5ce82aeaed16'
+b2sums=('7cf58513bf2266697843f6d91fbb214268ad511e110a4e2b66bc0db84ecb4df724a7d65f641eee5837f4d88c1371ec8b313ee8aaa1d1f0260709eae2e3af32b3'
'SKIP'
- '23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572'
+ '74b6ea3f314aa8291c9e2c3b5763f9b0c8aabbc0e714e30529f557955a7a315b44b0cd2f2d665ffe3ba48e7df71274c5901d3891ed395191ceb6ca88f69cdb1a'
'7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
'067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a'
- 'de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc'
- '9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327'
- 'd6bb0e91f5a5d263648b73aacf4e8aa4a7148daee887017a3a8b67ecfda1c3b592a14eeb2ee405535c9bd509c1318a99ab69651a00e62d55a7c8da6fa2b28fa5')
+ '99474f274431a7491ffc1a2b7fd20aad76699c0a9b442b8ce3459bade402ec002e4b67a40e1cc8b802752add70ee6ce77cc8055b8f4c2d81adfcd001d8a2eb13'
+ '3264190050a0cac1b63057c08dbcf07d351a370b08eccc70122e44a935e7e41f64fbb7444e986773266d69c3f6354d3c2e49282d6308dca4ec24a92dc93ff917')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 14e36dce34be..bf6a4452b79b 100644
--- a/config
+++ b/config
@@ -3832,7 +3832,7 @@ CONFIG_KEYBOARD_XTKBD=m
CONFIG_KEYBOARD_CROS_EC=m
CONFIG_KEYBOARD_MTK_PMIC=m
CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ALPS=y
CONFIG_MOUSE_PS2_BYD=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y