Mauro Carvalho Chehab <[email protected]> writes: > Hi Jon, > > After a restful weekend and revisiting both yours and my series, > I'm opting to send a patch series merging both into one: > > - The first 4 patches are from my series (no changes since v5): > > https://lore.kernel.org/linux-doc/[email protected]/T/#m81211c0ff38bbaa82b8b0b6606f242ccc0c2a9ac > > - It follows by the 2 patches from your renaming series: > > https://lore.kernel.org/linux-doc/[email protected]/T/#m51099c31a99dccccdb4d17cbaadc818e9e4df8c4 > > with the fix I proposed for kernel-doc to find its libraries > > I added 3 patches afterwards: > > - patch 5: move possible return values from docstring to helper message; > - patch 6: improve MsgFormatter description; > - patch 7: moves kerneldoc_bin from conf.py to the sphinx/kerneldoc.py > (this is now just a debugging message - no need to pick it from env) > > IMO, this series is ready to be merged.
Patch 7 adds a new warning: WARNING: unknown config value 'kerneldoc_bin' in override, ignoring It needs to be taken out of sphinx-build-wrapper; I've appended the following patch to the series to deal with it. I think I'll go ahead and tack on a patch putting in the scripts/kernel-doc symlink, then I guess it's ready to go. Thanks, jon >From 4a3efd128f7da996b677151790d043ec44a00561 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet <[email protected]> Date: Tue, 20 Jan 2026 15:50:38 -0700 Subject: [PATCH] docs: sphinx-build-wrapper: stop setting kerneldoc_bin for Sphinx Now that the Sphinx build does not use the kerneldoc_bin configuration variable, we shouldn't try to set it in the build wrapper or we get a nifty warning: WARNING: unknown config value 'kerneldoc_bin' in override, ignoring Signed-off-by: Jonathan Corbet <[email protected]> --- tools/docs/sphinx-build-wrapper | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/docs/sphinx-build-wrapper b/tools/docs/sphinx-build-wrapper index cb2a5005e633..9f1ae1485f84 100755 --- a/tools/docs/sphinx-build-wrapper +++ b/tools/docs/sphinx-build-wrapper @@ -750,7 +750,6 @@ class SphinxBuilder: build_args = args + [ "-d", doctree_dir, - "-D", f"kerneldoc_bin={kerneldoc}", "-D", f"version={self.kernelversion}", "-D", f"release={self.kernelrelease}", "-D", f"kerneldoc_srctree={self.srctree}", -- 2.52.0
