Disable code tag testing (broken in 6.2).

3 files changed, 9 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c99ef763c28..9599f46d8c0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-simple-bcachefs-git
 	pkgdesc = Linux
-	pkgver = 6.2.arch1.r2547
+	pkgver = 6.2.arch1.r2581
 	pkgrel = 1
 	url = https://github.com/archlinux/linux/commits/v6.2-arch1
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = linux-simple-bcachefs-git
 	makedepends = git
 	options = !strip
 	source = config
-	sha256sums = a80dfd64eca60673422052ac4d1444b0f9495a588c2595d413fd0687f3786586
+	sha256sums = 0de84fa8598e5896b82f12d5a72fbf1cbbbf31ed1b13ee3cdc18eb8ce06ed0f9
 
 pkgname = linux-simple-bcachefs-git
 	pkgdesc = The Linux kernel and modules with bcachefs support
diff --git a/PKGBUILD b/PKGBUILD
index 1bb91bf212ac..e39a2b37694e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _bcachefsname=bcachefs-linux
 _bcachefsurl="https://evilpiepirate.org/git/bcachefs.git"
 
 pkgbase=linux-simple-bcachefs-git
-pkgver=6.2.arch1.r2547
+pkgver=6.2.arch1.r2581
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${_ver%.*}-${_ver##*.}
@@ -25,7 +25,7 @@ makedepends=(
 options=('!strip')
 source=(config         # the main kernel config file
 )
-sha256sums=('a80dfd64eca60673422052ac4d1444b0f9495a588c2595d413fd0687f3786586'
+sha256sums=('0de84fa8598e5896b82f12d5a72fbf1cbbbf31ed1b13ee3cdc18eb8ce06ed0f9'
 )
 
 export KBUILD_BUILD_HOST=archlinux
@@ -95,10 +95,13 @@ prepare() {
 
   echo "Setting config..."
   cp ../config .config
-  printf '%s\n%s\n%s\n%s\n%s\n' \
+  # Tag testing is badly broken in 6.2
+  printf '%s\n%s\n%s\n%s\n%s\n%s\n%s\n' \
+    "CONFIG_CODE_TAG_TESTING=n" \
     "CONFIG_BCACHEFS_FS=y" \
     "CONFIG_BCACHEFS_QUOTA=y" \
     "CONFIG_BCACHEFS_POSIX_ACL=y" \
+    "CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=n" \
     "# CONFIG_BCACHEFS_DEBUG is not set" \
     "# CONFIG_BCACHEFS_TESTS is not set" >> .config
   make olddefconfig
diff --git a/config b/config
index 9f44c52888df..27872839b18b 100644
--- a/config
+++ b/config
@@ -2322,7 +2322,7 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_FW_CS_DSP=m
 CONFIG_GOOGLE_FIRMWARE=y
 # CONFIG_GOOGLE_SMI is not set