Merge remote-tracking branch 'origin/pr/845'

* origin/pr/845: Update to kernel-6.5.8
QubesOS · Oct 22, 2023 · fb404f2 · fb404f2
2 parents 83ff48a + 53c5fcd
commit fb404f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/config-base b/config-base
@@ -1,4 +1,4 @@
-# Base config based on Fedora's config (kernel-core-6.5.5-300.fc39.x86_64.rpm)
+# Base config based on Fedora's config (kernel-core-6.5.8-300.fc39.x86_64.rpm)
 # Only modification is `yes '' | make oldconfig` to drop config settings which
 # depend on Fedora patches and adjust for the small version difference.
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230728 (Red Hat 13.2.1-1)"
@@ -30,7 +30,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_UAPI_HEADER_TEST=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="6.5.5-300.fc39.x86_64"
+CONFIG_BUILD_SALT="6.5.8-300.fc39.x86_64"
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -9998,6 +9998,8 @@ CONFIG_IMA_ARCH_POLICY=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_APPRAISE_MODSIG=y
 CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y

diff --git a/rel b/rel
@@ -1 +1 @@
-2
+1
diff --git a/version b/version
@@ -1 +1 @@
-6.5.6
+6.5.8