From: Salvatore Bonaccorso <carnil@debian.org>
To: Andreas Radke <andreas.radke@mailbox.org>
Cc: stable <stable@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>, Zhixu Liu <zhixu.liu@gmail.com>,
Jonathan Corbet <corbet@lwn.net>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: Please backport commit 00d95fcc4dee ("docs: kdoc: handle the obsolescensce of docutils.ErrorString()") to v6.17.y
Date: Sun, 26 Oct 2025 13:56:58 +0100 [thread overview]
Message-ID: <aP4amn4YQDnzBBCU@eldamar.lan> (raw)
In-Reply-To: <DDS2XJZB0ECJ.N4LNABSIJHAJ@mailbox.org>
Hi,
On Sun, Oct 26, 2025 at 08:36:00AM +0100, Andreas Radke wrote:
> For kernel 6.12 there's just one more place required to add the fix:
>
> --- a/Documentation/sphinx/kernel_abi.py 2025-10-23 16:20:48.000000000 +0200
> +++ b/Documentation/sphinx/kernel_abi.py.new 2025-10-26 08:08:33.168985951 +0100
> @@ -42,9 +42,11 @@
> from docutils import nodes, statemachine
> from docutils.statemachine import ViewList
> from docutils.parsers.rst import directives, Directive
> -from docutils.utils.error_reporting import ErrorString
> from sphinx.util.docutils import switch_source_input
>
> +def ErrorString(exc): # Shamelessly stolen from docutils
> + return f'{exc.__class__.__name}: {exc}'
> +
> __version__ = '1.0'
>
> def setup(app):
Yes this is why I asked Jonathan, how to handle backports to older
series, if it is wanted to pick specifically as well faccc0ec64e1
("docs: sphinx/kernel_abi: adjust coding style") or a partial backport
of it, or do a 6.12.y backport of 00d95fcc4dee with additional
changes (like you pointed out).
I'm just not sure what is preferred here.
Regards,
Salvatore
next prev parent reply other threads:[~2025-10-26 12:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-19 15:22 Please backport commit 00d95fcc4dee ("docs: kdoc: handle the obsolescensce of docutils.ErrorString()") to v6.17.y Salvatore Bonaccorso
2025-10-26 7:36 ` Andreas Radke
2025-10-26 12:56 ` Salvatore Bonaccorso [this message]
2025-10-27 16:06 ` Jonathan Corbet
2025-10-28 20:10 ` Salvatore Bonaccorso
2025-10-28 21:29 ` Jonathan Corbet
2025-10-31 12:33 ` 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=aP4amn4YQDnzBBCU@eldamar.lan \
--to=carnil@debian.org \
--cc=andreas.radke@mailbox.org \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=zhixu.liu@gmail.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).