summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO12
-rw-r--r--010-linux-fix-documentation.patch11
-rw-r--r--PKGBUILD10
-rw-r--r--config8
4 files changed, 12 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 476bb80cbe50..89f6134f6f56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-libre
pkgdesc = Linux Libre
- pkgver = 6.8.6
+ pkgver = 6.8.7
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.6-gnu/patch-6.8-gnu-6.8.6-gnu.bz2
- source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.6-gnu/patch-6.8-gnu-6.8.6-gnu.bz2.sign
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.7-gnu/patch-6.8-gnu-6.8.7-gnu.bz2
+ source = http://linux-libre.fsfla.org/pub/linux-libre/releases/6.8.7-gnu/patch-6.8-gnu-6.8.7-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,12 +32,11 @@ 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 = fa9040d49ff10d7b30ef3fb64a45a7b7c9cd7d4ceffb508fbba02f8f59f560e7
+ sha256sums = 4cd27c89ef52256bd6efb03b4fbeaf5d0d9dc60f0ae8d7d36893a45701963036
sha256sums = SKIP
sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494
sha256sums = SKIP
@@ -45,8 +44,7 @@ pkgbase = linux-libre
sha256sums = SKIP
sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74
sha256sums = SKIP
- sha256sums = 995a006478c691a88a158f9b3f2bd480f29e8d2cc98618035d3727f00e5648fe
- sha256sums = 3100fb7ee271b9be54e9d60a9637815632ebf5e31249945cdb4fad6d07953991
+ sha256sums = 879a4a8e65790ae85ba69d73dd48d90324cdeb83449892aaf0589c0a46f52f5f
pkgname = linux-libre
pkgdesc = The Linux Libre kernel and modules
diff --git a/010-linux-fix-documentation.patch b/010-linux-fix-documentation.patch
deleted file mode 100644
index 216113a3f62a..000000000000
--- a/010-linux-fix-documentation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 53593a963cab..31afb83549f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# Contributor (Parabola): Luke R. <g4jc@openmailbox.org>
pkgbase=linux-libre
-pkgver=6.8.6
+pkgver=6.8.7
pkgrel=1
pkgdesc='Linux Libre'
url='https://linux-libre.fsfla.org/'
@@ -38,11 +38,10 @@ _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'
- '010-linux-fix-documentation.patch')
+ 'config')
sha256sums=('f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7'
'SKIP'
- 'fa9040d49ff10d7b30ef3fb64a45a7b7c9cd7d4ceffb508fbba02f8f59f560e7'
+ '4cd27c89ef52256bd6efb03b4fbeaf5d0d9dc60f0ae8d7d36893a45701963036'
'SKIP'
'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
'SKIP'
@@ -50,8 +49,7 @@ sha256sums=('f6c64e8ea831ffb71dedd1311e168fc7b142b025ec5fafa22ff6aedd9925bbe7'
'SKIP'
'13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
'SKIP'
- '995a006478c691a88a158f9b3f2bd480f29e8d2cc98618035d3727f00e5648fe'
- '3100fb7ee271b9be54e9d60a9637815632ebf5e31249945cdb4fad6d07953991')
+ '879a4a8e65790ae85ba69d73dd48d90324cdeb83449892aaf0589c0a46f52f5f')
validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P.
diff --git a/config b/config
index 9443f3ad24ae..d6912615115d 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.6-gnu Kernel Configuration
+# Linux/x86 6.8.7-gnu Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
CONFIG_CC_IS_GCC=y
@@ -565,9 +565,7 @@ 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_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -4616,7 +4614,7 @@ CONFIG_MOXA_INTELLIO=m
CONFIG_MOXA_SMARTIO=m
CONFIG_N_HDLC=m
CONFIG_IPWIRELESS=m
-CONFIG_N_GSM=m
+# CONFIG_N_GSM is not set
CONFIG_NOZOMI=m
CONFIG_NULL_TTY=m
CONFIG_HVC_DRIVER=y