summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-08-17 08:28:55 +0100
committerGitHub <noreply@github.com>2021-08-17 08:28:55 +0100
commit8c3b502c7cf4f364a9949f65ba22921693df2d19 (patch)
tree97593805d877a04730bf8d694aeafdd1763db8b3
parentMerge pull request #134405 from NixOS/backport-134402-to-release-21.05 (diff)
parentnixos: fix release notes about linux_latest version (diff)
downloadnixpkgs-8c3b502c7cf4f364a9949f65ba22921693df2d19.tar.gz
Merge pull request #134406 from NixOS/backport-134340-to-release-21.05
[Backport release-21.05] nixos: fix release notes about linux_latest version
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2105.section.xml2
-rw-r--r--nixos/doc/manual/release-notes/rl-2105.section.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
index 7e89051fec3d..b569f87e4b69 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
@@ -84,7 +84,7 @@
</listitem>
<listitem>
<para>
- The linux_latest kernel was updated to the 5.12 series. It
+ The linux_latest kernel was updated to the 5.13 series. It
currently is not officially supported for use with the zfs
filesystem. If you use zfs, you should use a different kernel
version (either the LTS kernel, or track a specific one).
diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md
index afef64fbfa54..5ea360b89e3e 100644
--- a/nixos/doc/manual/release-notes/rl-2105.section.md
+++ b/nixos/doc/manual/release-notes/rl-2105.section.md
@@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- Python optimizations were disabled again. Builds with optimizations enabled are not reproducible. Optimizations can now be enabled with an option.
-- The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one).
+- The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one).
## New Services {#sec-release-21.05-new-services}