Updated to 5.10.20

3 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e04344638d7d..fa9a364db4b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-mainline-bcachefs
 	pkgdesc = Linux-tkg with bcachefs
-	pkgver = 5.10.18
-	pkgrel = 127
+	pkgver = 5.10.20
+	pkgrel = 131
 	url = http://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -28,12 +28,12 @@ pkgbase = linux-mainline-bcachefs
 	options = !strip
 	options = docs
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.18.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.20.xz
 	source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config.x86_64
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config_hardened.x86_64
-	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/90-cleanup.hook
-	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/cleanup
+	source = 90-cleanup.hook
+	source = cleanup
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0002-clear-patches.patch
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0003-glitched-base.patch
@@ -58,7 +58,7 @@ pkgbase = linux-mainline-bcachefs
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/ryzen-desktop-profile.cfg
 	source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg
 	sha256sums = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
-	sha256sums = 97c728530644bc698f523f7f91e416963315a6fb755eb77eb420135e5f179ee5
+	sha256sums = 97680df2a1333328bc13ef3a3a0b6bfe3edb479c68d4961f0739e85bd73779f6
 	sha256sums = SKIP
 	sha256sums = 458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a
 	sha256sums = eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341
diff --git a/PKGBUILD b/PKGBUILD
index d18e77d7349f..eef17ce38cf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=127
+pkgrel=131
 pkgdesc='Linux-tkg with bcachefs'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -85,7 +85,7 @@ options=('!strip' 'docs')
         "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg"
     )
     sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
-            '97c728530644bc698f523f7f91e416963315a6fb755eb77eb420135e5f179ee5'
+            '97680df2a1333328bc13ef3a3a0b6bfe3edb479c68d4961f0739e85bd73779f6'
             'SKIP'
             '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
             'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341'
diff --git a/prepare b/prepare
index 1fdefb70323f..8a76c9cc7e43 100644
--- a/prepare
+++ b/prepare
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-ver54=100
+ver54=102
 ver57=19
 ver58=18
 ver59=16
-ver510=18
-ver511=1
+ver510=20
+ver511=3
+ver512=rc1
 
 _tkg_initscript() {
 
@@ -860,11 +861,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     plain "Use CattaRappa mode (Tickless/Dynticks) ?"
     plain "Can give higher performances in many cases but lower consistency on some hardware."
     plain "Just tickless idle can perform better with some platforms (mostly AMD) or CPU schedulers (mostly MuQSS)."
-    if [ "${_cpusched}" = "MuQSS" ]; then
-      read -rp "`echo $'\n      0.No, use periodic ticks\n      1.Yes, full tickless baby!\n    > 2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
-    else
-      read -rp "`echo $'\n      0.No, use periodic ticks\n    > 1.Yes, full tickless baby!\n      2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
-    fi
+    read -rp "`echo $'\n      0.No, use periodic ticks\n      1.Yes, full tickless baby!\n    > 2.Just tickless idle plz\n    [0-2?]: '`" CONDITION4;
   fi
   if [ "$CONDITION4" = "0" ] || [ "$_tickless" = "0" ]; then
     echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
@@ -873,42 +870,26 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
     sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
     sed -i -e 's/CONFIG_NO_HZ=y/# CONFIG_NO_HZ is not set/' ./.config
     sed -i -e 's/CONFIG_NO_HZ_COMMON=y/# CONFIG_NO_HZ_COMMON is not set/' ./.config
-  elif [ "$CONDITION4" = "2" ] || [ "$_tickless" = "2" ]; then
+  elif [ "$CONDITION4" = "2" ] || [ "$_tickless" = "1" ]; then
+    echo "CONFIG_NO_HZ_FULL_NODEF=y" >> ./.config
+    sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
+    sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ_FULL is not set/CONFIG_NO_HZ_FULL=y/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
+    sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
+    echo "CONFIG_CONTEXT_TRACKING=y" >> ./.config
+    echo "# CONFIG_CONTEXT_TRACKING_FORCE is not set" >> ./.config
+  else
     echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
     sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
     sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
     sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-  else
-    if [ "${_cpusched}" = "MuQSS" ]; then
-      echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
-      sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
-      sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-    else
-      echo "CONFIG_NO_HZ_FULL_NODEF=y" >> ./.config
-      sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
-      sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_FULL is not set/CONFIG_NO_HZ_FULL=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
-      sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
-      echo "CONFIG_CONTEXT_TRACKING=y" >> ./.config
-      echo "# CONFIG_CONTEXT_TRACKING_FORCE is not set" >> ./.config
-    fi
   fi
 
   # voluntary preempt
-  if [ -z "$_voluntary_preempt" ]; then
-    plain ""
-    plain "Use explicit preemption points?"
-    plain "It can improve latency on PDS (at the cost of throughput)"
-    plain "and improve throughput on other schedulers (at the cost of latency)"
-    read -rp "`echo $'    > N/y : '`" CONDITION5;
-  fi
-  if [[ "$CONDITION5" =~ [yY] ]] || [ "$_voluntary_preempt" = "true" ]; then
+  if [ "$_voluntary_preempt" = "true" ]; then
     sed -i -e 's/CONFIG_PREEMPT=y/# CONFIG_PREEMPT is not set/' ./.config
     sed -i -e 's/CONFIG_PREEMPT_LL=y/# CONFIG_PREEMPT_LL is not set/' ./.config
     sed -i -e 's/# CONFIG_PREEMPT_VOLUNTARY is not set/CONFIG_PREEMPT_VOLUNTARY=y/' ./.config