6.8.5.arch1-1

4 files changed, 41 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6cdf1a664ef..b7d4baa3244e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-flowx13
 	pkgdesc = Linux (with patches for the Asus Flow X13)
-	pkgver = 6.8.4.arch1
+	pkgver = 6.8.5.arch1
 	pkgrel = 1
 	url = https://github.com/archlinux/linux
 	arch = x86_64
@@ -21,26 +21,29 @@ pkgbase = linux-flowx13
 	makedepends = texlive-latexextra
 	options = !debug
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.4.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.4.tar.sign
-	source = https://github.com/archlinux/linux/releases/download/v6.8.4-arch1/linux-v6.8.4-arch1.patch.zst
-	source = https://github.com/archlinux/linux/releases/download/v6.8.4-arch1/linux-v6.8.4-arch1.patch.zst.sig
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.5.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.5.tar.sign
+	source = https://github.com/archlinux/linux/releases/download/v6.8.5-arch1/linux-v6.8.5-arch1.patch.zst
+	source = https://github.com/archlinux/linux/releases/download/v6.8.5-arch1/linux-v6.8.5-arch1.patch.zst.sig
 	source = config
+	source = docutils.patch
 	source = 0001-HID-amd_sfh-Add-support-for-tablet-mode-switch-senso.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
-	sha256sums = d5dec495fc00605fa9e04114df547fbc92b33d9ea7a4a2b7073c589590e79e63
+	sha256sums = 138923e5d73748b4bdbe9b5a0b8f36dfac9fcc16753a9222928dc6c963effa89
 	sha256sums = SKIP
-	sha256sums = bb2b3aa16007a0d5d61571af86a44be414f8672dad5a719cbdc92bfb758b1217
+	sha256sums = 4ad162664e08e57ed8abf44827ecc2fce2eeb38b34988483a9183065a229534e
 	sha256sums = SKIP
-	sha256sums = 5c0ebdac3ab21e1282cca9f5d41412eab90352f6f2ec22ce660ad038a5ff48fa
+	sha256sums = 2fc20cbd7c4f7f3eeeba73b8e354cecb8757050d2c774992959f93ccde16d667
+	sha256sums = 9cb73cacbb3633f207d0c30e738cae9965adcd0b0eb5ecd60563fed1394c0f38
 	sha256sums = 92b8cee96a70a2f27db6ff8899e47b18884e289f3c2eb05500b37c5db6f23fe8
-	b2sums = cf58732397bfa11988b79901092887d53c3367d09f63da51ebdcc83518be3a7e9a638fbbb1ff080cd7abed633fadff03d1d7a3928b772de57b14e46e552f9462
+	b2sums = 795c67356a7992cc73a85a733471d0379156f7ba68eedd68d4aa099eb07b4eea4626239ae15cdcc409819c833beb1ec2dc4032b203363db52ab1cb8bc31ac4ea
 	b2sums = SKIP
-	b2sums = 51f592b6448e2fa81438048cc2b2fac6395f42f03e5a3bf2d3318e38db43a066ee0a24e364bee3fa42da939ff82f0bd44bba1a2b3fddd8cc61d370045e12b5fb
+	b2sums = c4b429ed4508893913c8bd709e8f62496283ba78e5d5bf4d84b734be6d106bd0888341161615af8303f48fb93ce46efda425ff3e56b0e3013c2af4ab95c9428f
 	b2sums = SKIP
-	b2sums = 4a712da6b32c9c9716d4797076a01f22035f3d28c56109d4bbcaf095847b0302bb2eda5ff51bca3e59cfe68befefc5c90dcfe3dc7a73064d3159421f705a5c4b
+	b2sums = 09628a4dbe1b5cd34fe5e53394c7e44558a7f2c133530f52ae2b6e022f3303d6f8f28f939b13e175a2b4532f7511de26240d26d7dca0543ceaae905d6decb768
+	b2sums = 0bb42a22c110f06a45e59a9adc194184a51ff97e5584d6ffabca0aa37e1e65ccaf44f43dc744eaa3861d6f6b00e299d4662bcf0c0d94478af9352b4c4f6b0ffd
 	b2sums = 5b4cff2ab2ce1d2464eb4b0b1398e2ad1af85c1322b9187e19894a7dff19e094ad0b7190122be5fdadde283d9433591bf6b55a045354d0abe5351bd4cd410dc4
 
 pkgname = linux-flowx13
diff --git a/PKGBUILD b/PKGBUILD
index d389f953575a..47c397d45e70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andrew Rabert <ar@nullsum.net>
 
 pkgbase=linux-flowx13
-pkgver=6.8.4.arch1
+pkgver=6.8.5.arch1
 pkgrel=1
 pkgdesc='Linux (with patches for the Asus Flow X13)'
 url='https://github.com/archlinux/linux'
@@ -35,6 +35,7 @@ source=(
   https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
   $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
   config  # the main kernel config file
+  docutils.patch  # fix the docs build
   0001-HID-amd_sfh-Add-support-for-tablet-mode-switch-senso.patch
 )
 validpgpkeys=(
@@ -43,17 +44,19 @@ validpgpkeys=(
   83BC8889351B5DEBBB68416EB8AC08600F108CDF  # Jan Alexander Steffens (heftig)
 )
 # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256sums=('d5dec495fc00605fa9e04114df547fbc92b33d9ea7a4a2b7073c589590e79e63'
+sha256sums=('138923e5d73748b4bdbe9b5a0b8f36dfac9fcc16753a9222928dc6c963effa89'
             'SKIP'
-            'bb2b3aa16007a0d5d61571af86a44be414f8672dad5a719cbdc92bfb758b1217'
+            '4ad162664e08e57ed8abf44827ecc2fce2eeb38b34988483a9183065a229534e'
             'SKIP'
-            '5c0ebdac3ab21e1282cca9f5d41412eab90352f6f2ec22ce660ad038a5ff48fa'
+            '2fc20cbd7c4f7f3eeeba73b8e354cecb8757050d2c774992959f93ccde16d667'
+            '9cb73cacbb3633f207d0c30e738cae9965adcd0b0eb5ecd60563fed1394c0f38'
             '92b8cee96a70a2f27db6ff8899e47b18884e289f3c2eb05500b37c5db6f23fe8')
-b2sums=('cf58732397bfa11988b79901092887d53c3367d09f63da51ebdcc83518be3a7e9a638fbbb1ff080cd7abed633fadff03d1d7a3928b772de57b14e46e552f9462'
+b2sums=('795c67356a7992cc73a85a733471d0379156f7ba68eedd68d4aa099eb07b4eea4626239ae15cdcc409819c833beb1ec2dc4032b203363db52ab1cb8bc31ac4ea'
         'SKIP'
-        '51f592b6448e2fa81438048cc2b2fac6395f42f03e5a3bf2d3318e38db43a066ee0a24e364bee3fa42da939ff82f0bd44bba1a2b3fddd8cc61d370045e12b5fb'
+        'c4b429ed4508893913c8bd709e8f62496283ba78e5d5bf4d84b734be6d106bd0888341161615af8303f48fb93ce46efda425ff3e56b0e3013c2af4ab95c9428f'
         'SKIP'
-        '4a712da6b32c9c9716d4797076a01f22035f3d28c56109d4bbcaf095847b0302bb2eda5ff51bca3e59cfe68befefc5c90dcfe3dc7a73064d3159421f705a5c4b'
+        '09628a4dbe1b5cd34fe5e53394c7e44558a7f2c133530f52ae2b6e022f3303d6f8f28f939b13e175a2b4532f7511de26240d26d7dca0543ceaae905d6decb768'
+        '0bb42a22c110f06a45e59a9adc194184a51ff97e5584d6ffabca0aa37e1e65ccaf44f43dc744eaa3861d6f6b00e299d4662bcf0c0d94478af9352b4c4f6b0ffd'
         '5b4cff2ab2ce1d2464eb4b0b1398e2ad1af85c1322b9187e19894a7dff19e094ad0b7190122be5fdadde283d9433591bf6b55a045354d0abe5351bd4cd410dc4')
 
 
diff --git a/config b/config
index 3d9903750ad2..6c3113a0c3f2 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.4-arch1 Kernel Configuration
+# Linux/x86 6.8.5-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
@@ -566,6 +566,9 @@ CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
 CONFIG_MITIGATION_RFDS=y
+CONFIG_SPECTRE_BHI_ON=y
+# CONFIG_SPECTRE_BHI_OFF is not set
+# CONFIG_SPECTRE_BHI_AUTO is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
diff --git a/docutils.patch b/docutils.patch
new file mode 100644
index 000000000000..175fb4f6c5da
--- /dev/null
+++ b/docutils.patch
@@ -0,0 +1,13 @@
+diff --git i/Documentation/sphinx/kernel_include.py w/Documentation/sphinx/kernel_include.py
+index abe768088377..4ba03e5380c6 100755
+--- i/Documentation/sphinx/kernel_include.py
++++ w/Documentation/sphinx/kernel_include.py
+@@ -97,7 +97,7 @@ class KernelInclude(Include):
+         # HINT: this is the only line I had to change / commented out:
+         #path = utils.relative_path(None, path)
+ 
+-        path = nodes.reprunicode(path)
++        path = str(path)
+         encoding = self.options.get(
+             'encoding', self.state.document.settings.input_encoding)
+         e_handler=self.state.document.settings.input_encoding_error_handler