aboutsummaryrefslogtreecommitdiff
path: root/Documentation/translations
diff options
context:
space:
mode:
authorGravatar Jonathan Corbet <corbet@lwn.net> 2021-10-04 16:44:16 -0600
committerGravatar Jonathan Corbet <corbet@lwn.net> 2021-10-04 16:44:16 -0600
commitb718f9d919d16fb7b97a890f74d34593d9cecd20 (patch)
treeed38d58283ae36e0478bac2e0d244e06dbcc2f1c /Documentation/translations
parentdocs: checkpatch: add multiline, do/while, and multiple-assignment messages (diff)
parentLinux 5.15-rc4 (diff)
downloadlinux-b718f9d919d16fb7b97a890f74d34593d9cecd20.tar.gz
linux-b718f9d919d16fb7b97a890f74d34593d9cecd20.tar.bz2
linux-b718f9d919d16fb7b97a890f74d34593d9cecd20.zip
Merge tag 'v5.15-rc4' into docs-next
This is needed to get a docs fix that entered via the DRM tree; testers have requested it so that PDF builds in docs-next work again.
Diffstat (limited to 'Documentation/translations')
-rw-r--r--Documentation/translations/zh_CN/admin-guide/README.rst2
-rw-r--r--Documentation/translations/zh_TW/admin-guide/README.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/translations/zh_CN/admin-guide/README.rst b/Documentation/translations/zh_CN/admin-guide/README.rst
index 669a022f6817..980eb20521cf 100644
--- a/Documentation/translations/zh_CN/admin-guide/README.rst
+++ b/Documentation/translations/zh_CN/admin-guide/README.rst
@@ -223,7 +223,7 @@ Linux内核5.x版本 <http://kernel.org/>
编译内核
---------
- - 确保您至少有gcc 4.9可用。
+ - 确保您至少有gcc 5.1可用。
有关更多信息,请参阅 :ref:`Documentation/process/changes.rst <changes>` 。
请注意,您仍然可以使用此内核运行a.out用户程序。
diff --git a/Documentation/translations/zh_TW/admin-guide/README.rst b/Documentation/translations/zh_TW/admin-guide/README.rst
index b752e50359e6..6ce97edbab37 100644
--- a/Documentation/translations/zh_TW/admin-guide/README.rst
+++ b/Documentation/translations/zh_TW/admin-guide/README.rst
@@ -226,7 +226,7 @@ Linux內核5.x版本 <http://kernel.org/>
編譯內核
---------
- - 確保您至少有gcc 4.9可用。
+ - 確保您至少有gcc 5.1可用。
有關更多信息,請參閱 :ref:`Documentation/process/changes.rst <changes>` 。
請注意,您仍然可以使用此內核運行a.out用戶程序。