update linux-ck-uksm to 5.12.19-3

3 files changed, 8 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 749ad17b54d6..cd69e41463bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ck-uksm
 	pkgver = 5.12.19
-	pkgrel = 2
+	pkgrel = 3
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
@@ -26,16 +26,7 @@ pkgbase = linux-ck-uksm
 	source = 0007-x86-crash-remove-crash_reserve_low_1M.patch
 	source = 0008-UKSM.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/uksm-patches/0001-UKSM-for-5.12.patch
 	source = 0009-bbr2.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/bbr2-patches-v3/0001-bbr2-patches.patch
-	source = 0010-btrfs.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/btrfs-patches-v14/0001-btrfs-patches.patch
-	source = 0011-block.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/block-patches-v7/0001-block-patches.patch
-	source = 0012-bfq.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/bfq-patches-v15/0001-bfq-patches.patch
-	source = 0013-futex.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/futex-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch
-	source = 0014-futex2.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/futex2-stable-patches-v7/0001-futex2-resync-from-gitlab.collabora.com.patch
-	source = 0015-lru.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/lru-patches-v4/0001-lru-patches.patch
-	source = 0016-zstd.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/zstd-patches-v2/0001-zstd-patches.patch
-	source = 0017-initramfs.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/initramfs-patches/0001-initramfs-patches.patch
-	source = 0018-android.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch
-	source = 0019-compaction.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/compaction-patches/0001-compaction-patches.patch
+	source = 0010-lru.patch::https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.12/lru-patches-v4/0001-lru-patches.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	b2sums = 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6
@@ -52,16 +43,7 @@ pkgbase = linux-ck-uksm
 	b2sums = ed1dc0f7e4f97969185de71b8f26c321359e06855d3c3b2ac3fccf2d1cdae121feb70fc5a6546c63d2ca0ce3ef21d510a40e4077262715d53165a1b236119788
 	b2sums = 14f45171afc3b15488b40a05e58b352c5057da3a5782e13527392f7750d8e45a8db54f9b50b218fedb8bf679de3b4e5d78e230a44f7b1aa482f7b3aa831bd641
 	b2sums = b6ab69f6b24293504f32a2fb10622c0e77ece7921c637456fba5e61e4d200063832be37a8119fae251d490cc4b80cfea3e45547e17de3cb363bcee164dffd581
-	b2sums = 5cb420d8889ed8d254b811a5a85f1267476cd8b18cff686fc68feb08fcb656475ed622977938cba98b32779610ab9d145dcaf59ce1b726bbd5644cba3d01e36a
-	b2sums = f6bad0e2ceac2849ff6d3ef330165bc06a6061bc7c653c084674af40598bf4aab826dd7039b05eb07fede3a3e45b9c3ba11c684930c383cf3eef18c98091e3bc
-	b2sums = 9aba508592818a4b4f000fc1bd471ec74687c8f0f972f330e851bd2364eaf30cff4d5012f843625ca025bc2478a2c76e0d082d43f33358ab18ce829fab4f0c2b
-	b2sums = 93cf09821abb234a04550c659aa5a4d5632297e326fc61caf8c65c74bb35bc37fdd0dd1d769e6512a8471177bd01f765400e5292ca2b93ad95f7a7e24ab8e996
-	b2sums = 294f42c9e5099f923c0f2bfde2168e0e90cced379ae195cbe9505ab029900c60f17f58fa2200999a2dca91c9354f072d5171806bd9b4f8961d3d55281d7c6707
 	b2sums = 195d90d613a64d7525b4fe228b6932fc1b821395559d6851b3cb5369431ac2b6e85119a0160040295697f69288e64335620bd94857c32b9302f39638a73833f9
-	b2sums = 79585aa697309a34c169caca2881b39a953f3d7bd0aa901ad372161b285bbea7d3af89e62e63d0ba1821f3bfbcec738a2666c42fcf13a65cfea243646a4d5aa1
-	b2sums = ea09f90db718788ee43cce862261c473fc9ad82627eaa851a22fc4307268f93fe4cd33f37b7ac47f5e9fb89284cea9753e455f1539f02bab6a7a484fa58bcd19
-	b2sums = 7f7421abd36991ed0c8453bc54e1b7ed787f90b0a434d8f8db7bc979723e8ed3249a99e61e4b160cde44ebc2cec4b489a24bd37bc58ddaa73f1156e65c05dfc0
-	b2sums = 1439844e0f64f7a4218abf1841b9cddc679ee3af0957b8d0ca962aaac43d5ebdb8582405bed4474b067bd48f5ec5f83fac04044470e9f2d7aead224975d6ecab
 
 pkgname = linux-ck-uksm
 	pkgdesc = The Linux-ck-uksm kernel and modules with the ck1 and uksm patchesset featuring MuQSS CPU scheduler
diff --git a/PKGBUILD b/PKGBUILD
index 6780efc797f9..346199a762b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,13 +69,12 @@ _subarch=36
 
 pkgbase=linux-ck-uksm
 pkgver=5.12.19
-pkgrel=2
+pkgrel=3
 _major=5.12
 _ckpatchversion=1
 _ckpatch="patch-${_major}-ck${_ckpatchversion}"
 _gcc_more_v=20210610
 _patches_url="https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_major}"
-_jobs=$(nproc)
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
 license=(GPL2)
@@ -97,16 +96,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar".{xz,s
         0007-x86-crash-remove-crash_reserve_low_1M.patch
         "0008-UKSM.patch::${_patches_url}/uksm-patches/0001-UKSM-for-${_major}.patch"
         "0009-bbr2.patch::${_patches_url}/bbr2-patches-v3/0001-bbr2-patches.patch"
-        "0010-btrfs.patch::${_patches_url}/btrfs-patches-v14/0001-btrfs-patches.patch"
-        "0011-block.patch::${_patches_url}/block-patches-v7/0001-block-patches.patch"
-        "0012-bfq.patch::${_patches_url}/bfq-patches-v15/0001-bfq-patches.patch"
-        "0013-futex.patch::${_patches_url}/futex-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch"
-        "0014-futex2.patch::${_patches_url}/futex2-stable-patches-v7/0001-futex2-resync-from-gitlab.collabora.com.patch"
-        "0015-lru.patch::${_patches_url}/lru-patches-v4/0001-lru-patches.patch"
-        "0016-zstd.patch::${_patches_url}/zstd-patches-v2/0001-zstd-patches.patch"
-        "0017-initramfs.patch::${_patches_url}/initramfs-patches/0001-initramfs-patches.patch"
-        "0018-android.patch::${_patches_url}/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch"
-        "0019-compaction.patch::${_patches_url}/compaction-patches/0001-compaction-patches.patch"
+        "0010-lru.patch::${_patches_url}/lru-patches-v4/0001-lru-patches.patch"
 )
 
 validpgpkeys=(
@@ -128,16 +118,7 @@ b2sums=('88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f4
         'ed1dc0f7e4f97969185de71b8f26c321359e06855d3c3b2ac3fccf2d1cdae121feb70fc5a6546c63d2ca0ce3ef21d510a40e4077262715d53165a1b236119788'
         '14f45171afc3b15488b40a05e58b352c5057da3a5782e13527392f7750d8e45a8db54f9b50b218fedb8bf679de3b4e5d78e230a44f7b1aa482f7b3aa831bd641'
         'b6ab69f6b24293504f32a2fb10622c0e77ece7921c637456fba5e61e4d200063832be37a8119fae251d490cc4b80cfea3e45547e17de3cb363bcee164dffd581'
-        '5cb420d8889ed8d254b811a5a85f1267476cd8b18cff686fc68feb08fcb656475ed622977938cba98b32779610ab9d145dcaf59ce1b726bbd5644cba3d01e36a'
-        'f6bad0e2ceac2849ff6d3ef330165bc06a6061bc7c653c084674af40598bf4aab826dd7039b05eb07fede3a3e45b9c3ba11c684930c383cf3eef18c98091e3bc'
-        '9aba508592818a4b4f000fc1bd471ec74687c8f0f972f330e851bd2364eaf30cff4d5012f843625ca025bc2478a2c76e0d082d43f33358ab18ce829fab4f0c2b'
-        '93cf09821abb234a04550c659aa5a4d5632297e326fc61caf8c65c74bb35bc37fdd0dd1d769e6512a8471177bd01f765400e5292ca2b93ad95f7a7e24ab8e996'
-        '294f42c9e5099f923c0f2bfde2168e0e90cced379ae195cbe9505ab029900c60f17f58fa2200999a2dca91c9354f072d5171806bd9b4f8961d3d55281d7c6707'
-        '195d90d613a64d7525b4fe228b6932fc1b821395559d6851b3cb5369431ac2b6e85119a0160040295697f69288e64335620bd94857c32b9302f39638a73833f9'
-        '79585aa697309a34c169caca2881b39a953f3d7bd0aa901ad372161b285bbea7d3af89e62e63d0ba1821f3bfbcec738a2666c42fcf13a65cfea243646a4d5aa1'
-        'ea09f90db718788ee43cce862261c473fc9ad82627eaa851a22fc4307268f93fe4cd33f37b7ac47f5e9fb89284cea9753e455f1539f02bab6a7a484fa58bcd19'
-        '7f7421abd36991ed0c8453bc54e1b7ed787f90b0a434d8f8db7bc979723e8ed3249a99e61e4b160cde44ebc2cec4b489a24bd37bc58ddaa73f1156e65c05dfc0'
-        '1439844e0f64f7a4218abf1841b9cddc679ee3af0957b8d0ca962aaac43d5ebdb8582405bed4474b067bd48f5ec5f83fac04044470e9f2d7aead224975d6ecab')
+        '195d90d613a64d7525b4fe228b6932fc1b821395559d6851b3cb5369431ac2b6e85119a0160040295697f69288e64335620bd94857c32b9302f39638a73833f9')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -236,7 +217,7 @@ prepare() {
 
 build() {
   cd linux-${pkgver}
-  make -j${_jobs} all
+  make -j40 all
 }
 
 _package() {
diff --git a/config b/config
index b06b0b6562a8..8baeed862fd2 100644
--- a/config
+++ b/config
@@ -41,14 +41,6 @@ CONFIG_HAVE_KERNEL_ZSTD=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_KERNEL_ZSTD=y
-
-#
-# ZSTD compression options
-#
-CONFIG_KERNEL_ZSTD_LEVEL=15
-CONFIG_KERNEL_ZSTD_LEVEL_ULTRA=y
-# end of ZSTD compression options
-
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
@@ -245,7 +237,6 @@ CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_FUTEX2=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
@@ -953,14 +944,9 @@ CONFIG_MODULE_SIG_ALL=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_MODULE_SIG_HASH="sha512"
 CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
+CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
-CONFIG_MODULE_COMPRESS_ZSTD=y
-CONFIG_MODULE_COMPRESS_ZSTD_ULTRA=y
-CONFIG_MODULE_COMPRESS_ZSTD_LEVEL=9
-CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA=20
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
@@ -8005,7 +7991,6 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
-CONFIG_ASHMEM=m
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8967,11 +8952,7 @@ CONFIG_USB4=m
 #
 # Android
 #
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
+# CONFIG_ANDROID is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y