btrfs update, docker fixed

2 files changed, 7 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3986be572ee..9dddad5c45ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cacule
 	pkgdesc = Linux-CacULE Kernel by Hamad Marri and with some other patchsets
 	pkgver = 5.12.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/hamadmarri/cacule-cpu-scheduler
 	arch = x86_64
 	license = GPL2
@@ -33,7 +33,7 @@ pkgbase = linux-cacule
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/ll-patches/0005-Disable-CPU_FREQ_GOV_SCHEDUTIL.patch
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/fixes-miscellaneous/0001-fixes-miscellaneous.patch
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/bbr2-patches-v2/0001-bbr2-5.12-introduce-BBRv2.patch
-	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/btrfs-patches-v3/0001-btrfs-patches.patch
+	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/btrfs-patches-v4/0001-btrfs-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/pf-patches-v2/0001-pf-patches.patch
 	source = https://raw.githubusercontent.com/ptr1337/linux-cacule-aur/master/patches/5.12/lru-patches-v4/0001-lru-patches.patch
@@ -56,7 +56,7 @@ pkgbase = linux-cacule
 	sha512sums = 47f265716ebd268e4296aaba1efe5098df00736b69ec7d0413cace6dbb5cb162c1c952f7527a2a41b246ed76e6e112514c5349e8dc52f4609def30257e18d7aa
 	sha512sums = 5081a6a3a3db160ef0a23acd0c0db403cc4b3eb2dfd280b1b7ba2ae907d362e4d6a653d546523c870af07009c62f58eec26e7b8174a3f4fcbaa32808d965ad73
 	sha512sums = 28446f518e88ab934330111a01019cb164bfdd21094c69e96cc16c7931440d069ef997ae141154c97c80fcb727e8c4d940b8bf63554e3f4179652523e285c5b4
-	sha512sums = 2c074e0d747eefc912e94d3109d91d51187e439e85d7cc50c292892c3d1ccdc14d32d4d97a57be8322d3a2ac462b3ec1956c39821639eefd5f72144ebacd0dd2
+	sha512sums = b765ef2b4b783f490fff9071727ace1215b9b588666c9518765323b9ada9207b3cfb9918a16b3f7eeb3cf5784d4c5919d7f3cde41236712c210dd9a733ff8320
 	sha512sums = 1b3b48246fe70e8ca7390cacacf560696c1d98604a7716ac32df8f3d7fc7cc2ab733ab24e372fffa63016344f2e4ed078f7d597c3c1261f0ca3ff1c87a13dcb9
 	sha512sums = 076a48767614ec97a84ccefa5795e4f36973f64a7728a9f716d5d9ecb6f6907ffcc74f7fab845e9d9aef3ef5d3d4df4e03f6c5a755c7fdd4bc43751003902e71
 	sha512sums = d428d3f54634b91e41cac279f7c7b708a174d9cac085b7497802c5a50f77bbfcfdd8799c1db3351ba18e8316685b729d292bb45de0da443762dbd1b87cbc7dad
diff --git a/PKGBUILD b/PKGBUILD
index 63714076bc4e..ec6865f8a3b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -56,7 +56,7 @@ pkgver=${_major}
 #_stable=${_major}.${_minor}
 #_stablerc=${_major}-${_rcver}
 _srcname=linux-${_major}
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux-CacULE Kernel by Hamad Marri and with some other patchsets'
 arch=('x86_64')
 url="https://github.com/hamadmarri/cacule-cpu-scheduler"
@@ -80,7 +80,7 @@ source=("https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/$_srcname.tar.xz"
         "${_patchsource}/ll-patches/0005-Disable-CPU_FREQ_GOV_SCHEDUTIL.patch"
         "${_patchsource}/fixes-miscellaneous/0001-fixes-miscellaneous.patch"
         "${_patchsource}/bbr2-patches-v2/0001-bbr2-5.12-introduce-BBRv2.patch"
-        "${_patchsource}/btrfs-patches-v3/0001-btrfs-patches.patch"
+        "${_patchsource}/btrfs-patches-v4/0001-btrfs-patches.patch"
         "${_patchsource}/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch"
         "${_patchsource}/pf-patches-v2/0001-pf-patches.patch"
         "${_patchsource}/lru-patches-v4/0001-lru-patches.patch"
@@ -104,7 +104,7 @@ sha512sums=('db6dd1746ffbf2e702336e444ddf31d2f50d62998566663ed07ec696dd2af860255
             '47f265716ebd268e4296aaba1efe5098df00736b69ec7d0413cace6dbb5cb162c1c952f7527a2a41b246ed76e6e112514c5349e8dc52f4609def30257e18d7aa'
             '5081a6a3a3db160ef0a23acd0c0db403cc4b3eb2dfd280b1b7ba2ae907d362e4d6a653d546523c870af07009c62f58eec26e7b8174a3f4fcbaa32808d965ad73'
             '28446f518e88ab934330111a01019cb164bfdd21094c69e96cc16c7931440d069ef997ae141154c97c80fcb727e8c4d940b8bf63554e3f4179652523e285c5b4'
-            '2c074e0d747eefc912e94d3109d91d51187e439e85d7cc50c292892c3d1ccdc14d32d4d97a57be8322d3a2ac462b3ec1956c39821639eefd5f72144ebacd0dd2'
+            'b765ef2b4b783f490fff9071727ace1215b9b588666c9518765323b9ada9207b3cfb9918a16b3f7eeb3cf5784d4c5919d7f3cde41236712c210dd9a733ff8320'
             '1b3b48246fe70e8ca7390cacacf560696c1d98604a7716ac32df8f3d7fc7cc2ab733ab24e372fffa63016344f2e4ed078f7d597c3c1261f0ca3ff1c87a13dcb9'
             '076a48767614ec97a84ccefa5795e4f36973f64a7728a9f716d5d9ecb6f6907ffcc74f7fab845e9d9aef3ef5d3d4df4e03f6c5a755c7fdd4bc43751003902e71'
             'd428d3f54634b91e41cac279f7c7b708a174d9cac085b7497802c5a50f77bbfcfdd8799c1db3351ba18e8316685b729d292bb45de0da443762dbd1b87cbc7dad'
@@ -308,16 +308,8 @@ prepare() {
       scripts/config --set-str CONFIG_DEFAULT_TCP_CONG bbr2
       echo "Enable CONFIG_VHBA"
       scripts/config --module CONFIG_VHBA
-      # disable CONFIG_DEBUG_INFO at build time otherwise memory usage blows up and
-      # can easily overwhelm a system with 32 GB of memory using a tmpfs build.
-      # introduced by FS#66260, see:
-      # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7
-      scripts/config --disable CONFIG_DEBUG_INFO
-      scripts/config --disable CONFIG_CGROUP_BPF
-      scripts/config --disable CONFIG_BPF_LSM
       scripts/config --disable CONFIG_BPF_PRELOAD
-      scripts/config --disable CONFIG_BPF_LIRC_MODE2
-      scripts/config --disable CONFIG_BPF_KPROBE_OVERRIDE
+
 
 
   ### Optionally load needed modules for the make localmodconfig