From: Jonathan Corbet <corbet@lwn.net>
To: Bagas Sanjaya <bagasdotme@gmail.com>,
Linux Documentation <linux-doc@vger.kernel.org>,
Linux x86 <x86@kernel.org>,
Linux Architectures <linux-arch@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>,
Yu-cheng Yu <yu-cheng.yu@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Borislav Petkov <bp@alien8.de>, Kees Cook <keescook@chromium.org>,
Mike Rapoport <rppt@kernel.org>
Subject: Re: Semantic conflict between x86 doc cleanup and CET shadow stack doc
Date: Wed, 19 Apr 2023 07:22:03 -0600 [thread overview]
Message-ID: <87mt34atxg.fsf@meer.lwn.net> (raw)
In-Reply-To: <ZD+1XVjMvm8EvCzN@debian.me>
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
next prev parent reply other threads:[~2023-04-19 13:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2023-04-20 4:21 ` Bagas Sanjaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mt34atxg.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=bagasdotme@gmail.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=x86@kernel.org \
--cc=yu-cheng.yu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).