Update to version 6.8.5

4 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d00730feb2ff..8f529a3a7cea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-libre
 	pkgdesc = Linux Libre
-	pkgver = 6.8.4
+	pkgver = 6.8.5
 	pkgrel = 1
 	url = https://linux-libre.fsfla.org/
 	arch = x86_64
@@ -23,8 +23,8 @@ pkgbase = linux-libre
 	options = !strip
 	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/6.8-gnu/linux-libre-6.8-gnu.tar.lz
 	source = https://linux-libre.fsfla.org/pub/linux-libre/releases/6.8-gnu/linux-libre-6.8-gnu.tar.lz.sign
-	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.4-gnu/patch-6.8-gnu-6.8.4-gnu.bz2
-	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.4-gnu/patch-6.8-gnu-6.8.4-gnu.bz2.sign
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.5-gnu/patch-6.8-gnu-6.8.5-gnu.bz2
+	source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.5-gnu/patch-6.8-gnu-6.8.5-gnu.bz2.sign
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm
@@ -32,11 +32,12 @@ pkgbase = linux-libre
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm
 	source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm.sig
 	source = config
+	source = 010-linux-fix-documentation.patch
 	validpgpkeys = 474402C8C582DAFBE389C427BCB7CF877E7D47A7
 	validpgpkeys = 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78
 	sha256sums = f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7
 	sha256sums = SKIP
-	sha256sums = 88d103b7236cc65c5e651ee73c99dfc39a8f429ef5f803f5a3bcd36b353fc773
+	sha256sums = 1150733877a38ba539f7903eb8ad833884fbc5e039ed0e80e17be8f2060d4897
 	sha256sums = SKIP
 	sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
 	sha256sums = SKIP
@@ -44,7 +45,8 @@ pkgbase = linux-libre
 	sha256sums = SKIP
 	sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74
 	sha256sums = SKIP
-	sha256sums = fe87ce23035e9b80fbe6d782491b3b34d403f03947c4d4438d2e08c5b7979c95
+	sha256sums = 5e6464fd462d9f330450ede59f5f2932d534be8c01bded42b72905374be551f4
+	sha256sums = 3100fb7ee271b9be54e9d60a9637815632ebf5e31249945cdb4fad6d07953991
 
 pkgname = linux-libre
 	pkgdesc = The Linux Libre kernel and modules
diff --git a/010-linux-fix-documentation.patch b/010-linux-fix-documentation.patch
new file mode 100644
index 000000000000..216113a3f62a
--- /dev/null
+++ b/010-linux-fix-documentation.patch
@@ -0,0 +1,11 @@
+--- a/Documentation/sphinx/kernel_include.py
++++ b/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
diff --git a/PKGBUILD b/PKGBUILD
index 257dee798910..a6e274c71db3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor (Parabola): Luke R. <g4jc@openmailbox.org>
 
 pkgbase=linux-libre
-pkgver=6.8.4
+pkgver=6.8.5
 pkgrel=1
 pkgdesc='Linux Libre'
 url='https://linux-libre.fsfla.org/'
@@ -38,10 +38,11 @@ _srcname=linux-${pkgver%.*}
 source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/linux-libre-${pkgver%.*}-gnu.tar.lz"{,.sign}
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${pkgver%.*}-gnu-${pkgver}-gnu.bz2"{,.sign}
         'https://repo.parabola.nu/other/linux-libre/logos/logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
-        'config')
+        'config'
+        '010-linux-fix-documentation.patch')
 sha256sums=('f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7'
             'SKIP'
-            '88d103b7236cc65c5e651ee73c99dfc39a8f429ef5f803f5a3bcd36b353fc773'
+            '1150733877a38ba539f7903eb8ad833884fbc5e039ed0e80e17be8f2060d4897'
             'SKIP'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             'SKIP'
@@ -49,7 +50,8 @@ sha256sums=('f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7'
             'SKIP'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
             'SKIP'
-            'fe87ce23035e9b80fbe6d782491b3b34d403f03947c4d4438d2e08c5b7979c95')
+            '5e6464fd462d9f330450ede59f5f2932d534be8c01bded42b72905374be551f4'
+            '3100fb7ee271b9be54e9d60a9637815632ebf5e31249945cdb4fad6d07953991')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7'  # Alexandre Oliva
               '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P.
 
diff --git a/config b/config
index 547595af930f..3db2b707a357 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.4-gnu Kernel Configuration
+# Linux/x86 6.8.5-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
@@ -565,6 +565,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
 
 #