Updated to 5.10.15

3 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b489fcf7969..513f0cc94d72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-mainline-bcachefs
 	pkgdesc = Linux-tkg with bcachefs
-	pkgver = 5.10.14
-	pkgrel = 119
+	pkgver = 5.10.15
+	pkgrel = 120
 	url = http://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -28,7 +28,7 @@ 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.13.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.15.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
@@ -60,7 +60,7 @@ pkgbase = linux-mainline-bcachefs
 	sha256sums = 9541437bd4a68d10d1f40f91080683fb6b8d99def258681b2fa74540d4f74082
 	sha256sums = SKIP
 	sha256sums = 458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a
-	sha256sums = eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341
+	sha256sums = fc126c14140668cc4bdbc8886fb8bc05ae734c5cf1e20b719b40b36d1dae255a
 	sha256sums = 1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898
 	sha256sums = 66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997
 	sha256sums = f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6
diff --git a/PKGBUILD b/PKGBUILD
index 3a28a8fb9e8a..2b774781c9d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=119
+pkgrel=120
 pkgdesc='Linux-tkg with bcachefs'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -79,7 +79,7 @@ options=('!strip' 'docs')
 	"https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg"
     )
     sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
-            '9541437bd4a68d10d1f40f91080683fb6b8d99def258681b2fa74540d4f74082'
+            'fc126c14140668cc4bdbc8886fb8bc05ae734c5cf1e20b719b40b36d1dae255a'
             'SKIP'
             '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
             'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341'
diff --git a/prepare b/prepare
index 866df5640c3d..45d68b771acf 100644
--- a/prepare
+++ b/prepare
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ver54=96
+ver54=97
 ver57=19
 ver58=18
 ver59=16
-ver510=14
+ver510=15
 ver511=rc7
 
 _tkg_initscript() {
@@ -408,7 +408,11 @@ _tkg_srcprep() {
 
   if [ "$_compiler_name" = "-llvm" ]; then
     echo 'CONFIG_KCSAN=n' >> ./.config
-    echo 'CONFIG_INIT_STACK_ALL=n' >> ./.config
+    if [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ]; then
+      echo 'CONFIG_INIT_STACK_ALL_PATTERN=n' >> ./.config
+    else
+      echo 'CONFIG_INIT_STACK_ALL=n' >> ./.config
+    fi
     sed -i -e 's/# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set/CONFIG_INIT_ON_FREE_DEFAULT_ON=y/' ./.config
     sed -i -e 's/CONFIG_INIT_STACK_NONE=y/CONFIG_INIT_STACK_NONE=n/' ./.config
     echo "CONFIG_INIT_STACK_ALL_ZERO=y" >> ./.config