mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
Documentation/arch/ia64/features.rst: fix kernel-feat directive
My mainline commitc48a7c44a1
("docs: kernel_feat.py: fix potential command injection") contains a bug which can manifests like this when building the documentation: Sphinx parallel build error: UnboundLocalError: local variable 'fname' referenced before assignment make[2]: *** [Documentation/Makefile:102: htmldocs] Error 2 However, this only appears when there exists a '.. kernel-feat::' directive that points to a non-existent file, which isn't the case in mainline. When this commit was backported to stable 6.6, it didn't change Documentation/arch/ia64/features.rst since ia64 was removed in 6.7 in commitcf8e865810
("arch: Remove Itanium (IA-64) architecture"). This lead to the build failure seen above -- but only in stable kernels. This patch fixes the backport and should only be applied to kernels where Documentation/arch/ia64/features.rst exists and commitc48a7c44a1
has also been applied. A second patch will follow to fix kernel_feat.py in mainline so that it doesn't error out when the '.. kernel-feat::' directive points to a nonexistent file. Link: https://lore.kernel.org/all/ZbkfGst991YHqJHK@fedora64.linuxtx.org/ Fixes:e961f8c696
("docs: kernel_feat.py: fix potential command injection") # stable 6.6.15 Reported-by: Justin Forbes <jforbes@fedoraproject.org> Reported-by: Salvatore Bonaccorso <carnil@debian.org> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ccce12ecf2
commit
cec85aa54b
1 changed files with 1 additions and 1 deletions
|
@ -1,3 +1,3 @@
|
|||
.. SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
.. kernel-feat:: $srctree/Documentation/features ia64
|
||||
.. kernel-feat:: features ia64
|
||||
|
|
Loading…
Reference in a new issue