* Semantic conflict between x86 doc cleanup and CET shadow stack doc
@ 2023-04-19 9:33 Bagas Sanjaya
2023-04-19 13:22 ` Jonathan Corbet
0 siblings, 1 reply; 3+ messages in thread
From: Bagas Sanjaya @ 2023-04-19 9:33 UTC (permalink / raw)
To: Linux Documentation, Linux x86, Linux Architectures,
Linux Next Mailing List
Cc: Jonathan Corbet, Rick Edgecombe, Yu-cheng Yu, Dave Hansen,
Borislav Petkov, Kees Cook, Mike Rapoport
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
Hi,
I see semantic conflict on next-20230418 between commit ff61f0791ce969 ("docs:
move x86 documentation into Documentation/arch/") and 54759b257eadb0
("Documentation/x86: Add CET shadow stack description"), which isn't noticed
when both jc_docs and tip trees were merged. The conflict triggers Sphinx table
of contents warnings:
Documentation/arch/x86/index.rst:7: WARNING: toctree contains reference to nonexisting document 'arch/x86/shstk'
Documentation/x86/shstk.rst: WARNING: document isn't included in any toctree
The fixup for the next merge window (when Linus pull both trees) should be
moving also CET shadow stack doc to Documentation/arch/x86/ (in line with
ff61f0791ce969).
Thanks.
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Semantic conflict between x86 doc cleanup and CET shadow stack doc
2023-04-19 9:33 Semantic conflict between x86 doc cleanup and CET shadow stack doc Bagas Sanjaya
@ 2023-04-19 13:22 ` Jonathan Corbet
2023-04-20 4:21 ` Bagas Sanjaya
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Corbet @ 2023-04-19 13:22 UTC (permalink / raw)
To: Bagas Sanjaya, Linux Documentation, Linux x86,
Linux Architectures, Linux Next Mailing List
Cc: Rick Edgecombe, Yu-cheng Yu, Dave Hansen, Borislav Petkov,
Kees Cook, Mike Rapoport
Bagas Sanjaya <bagasdotme@gmail.com> writes:
> Hi,
>
> I see semantic conflict on next-20230418 between commit ff61f0791ce969 ("docs:
> move x86 documentation into Documentation/arch/") and 54759b257eadb0
> ("Documentation/x86: Add CET shadow stack description"), which isn't noticed
> when both jc_docs and tip trees were merged. The conflict triggers Sphinx table
> of contents warnings:
>
> Documentation/arch/x86/index.rst:7: WARNING: toctree contains reference to nonexisting document 'arch/x86/shstk'
> Documentation/x86/shstk.rst: WARNING: document isn't included in any toctree
>
> The fixup for the next merge window (when Linus pull both trees) should be
> moving also CET shadow stack doc to Documentation/arch/x86/ (in line with
> ff61f0791ce969).
https://lore.kernel.org/lkml/20230331142016.0a6f8f6b%40canb.auug.org.au/
jon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Semantic conflict between x86 doc cleanup and CET shadow stack doc
2023-04-19 13:22 ` Jonathan Corbet
@ 2023-04-20 4:21 ` Bagas Sanjaya
0 siblings, 0 replies; 3+ messages in thread
From: Bagas Sanjaya @ 2023-04-20 4:21 UTC (permalink / raw)
To: Jonathan Corbet, Linux Documentation, Linux x86,
Linux Architectures, Linux Next Mailing List
Cc: Rick Edgecombe, Yu-cheng Yu, Dave Hansen, Borislav Petkov,
Kees Cook, Mike Rapoport, Mark Brown
On 4/19/23 20:22, Jonathan Corbet wrote:
> https://lore.kernel.org/lkml/20230331142016.0a6f8f6b%40canb.auug.org.au/
>
Thanks for the pointer 😌.
But I wonder why bronnie doesn't do this fixup...
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-20 4:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-19 9:33 Semantic conflict between x86 doc cleanup and CET shadow stack doc Bagas Sanjaya
2023-04-19 13:22 ` Jonathan Corbet
2023-04-20 4:21 ` Bagas Sanjaya
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).