From: Salvatore Bonaccorso <carnil@debian.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: stable <stable@vger.kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Sasha Levin" <sashal@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"André Almeida" <andrealmeid@collabora.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
"Jonathan Corbet" <corbet@lwn.net>
Subject: Re: [PATCH v2 stable-5.10.y stable-5.15.y] docs: futex: Fix kernel-doc references after code split-up preparation
Date: Sat, 22 Apr 2023 09:02:17 +0200 [thread overview]
Message-ID: <ZEOGeVyvOx6/xypo@eldamar.lan> (raw)
In-Reply-To: <bc5a2d13-4829-0c5a-837d-8842e16cd997@infradead.org>
Hi Randy,
On Fri, Apr 21, 2023 at 05:03:15PM -0700, Randy Dunlap wrote:
> Please see https://lore.kernel.org/all/20211012135549.14451-1-andrealmeid@collabora.com/
>
> Don't know what has happened to it though. :(
It was applied, as bc67f1c454fb ("docs: futex: Fix kernel-doc
references") in 5.16-rc1. But 5.10.y and 5.15.y picked up from the
refactoring only 77e52ae35463 ("futex: Move to kernel/futex/").
So this change is a specific backport of subset of it, to 5.10.y and
5.15.y thus the commit message:
> On 4/21/23 15:17, Salvatore Bonaccorso wrote:
> > In upstream commit 77e52ae35463 ("futex: Move to kernel/futex/") the
> > futex code from kernel/futex.c was moved into kernel/futex/core.c in
> > preparation of the split-up of the implementation in various files.
> >
> > Point kernel-doc references to the new files as otherwise the
> > documentation shows errors on build:
> >
> > [...]
> > Error: Cannot open file ./kernel/futex.c
> > Error: Cannot open file ./kernel/futex.c
> > [...]
> > WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -sphinx-version 3.4.3 -internal ./kernel/futex.c' failed with return code 2
> >
> > There is no direct upstream commit for this change. It is made in
> > analogy to commit bc67f1c454fb ("docs: futex: Fix kernel-doc
> > references") applied as consequence of the restructuring of the futex
> > code.
Here pointing out explicitly that there is no (direct) upstream commit
for it.
Hope this helps,
Regards,
Salvatore
next prev parent reply other threads:[~2023-04-22 7:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 22:17 [PATCH v2 stable-5.10.y stable-5.15.y] docs: futex: Fix kernel-doc references after code split-up preparation Salvatore Bonaccorso
2023-04-22 0:03 ` Randy Dunlap
2023-04-22 7:02 ` Salvatore Bonaccorso [this message]
2023-04-22 5:44 ` Greg Kroah-Hartman
2023-04-22 5:46 ` Greg Kroah-Hartman
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=ZEOGeVyvOx6/xypo@eldamar.lan \
--to=carnil@debian.org \
--cc=andrealmeid@collabora.com \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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).