diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-29 23:36:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-29 23:36:41 +0200 |
commit | bec7550cca106c3ccc061e3e625516af63054fe4 (patch) | |
tree | 2b53e2cb496c0159a4862a91ca2b7f83c562e4df /lib | |
parent | Merge tag 'linux-kselftest-5.2-rc3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | drm/i915: Maintain consistent documentation subsection ordering (diff) | |
download | linux-bec7550cca106c3ccc061e3e625516af63054fe4.tar.xz linux-bec7550cca106c3ccc061e3e625516af63054fe4.zip |
Merge tag 'docs-5.2-fixes2' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"The Sphinx 2.0 release contained a few incompatible API changes that
broke our extensions and, thus, the documentation build in general.
Who knew that those deprecation warnings it was outputting actually
meant we should change something? This set of fixes makes the build
work again with Sphinx 2.0 and eliminates the warnings for 1.8. As
part of that, we also need a few fixes to the docs for places where
the new Sphinx is more strict.
It is a bit late in the cycle for this kind of change, but it does fix
problems that people are experiencing now.
There has been some talk of raising the minimum version of Sphinx we
support. I don't want to do that abruptly, though, so these changes
add some glue to continue to support versions back to 1.3. We will be
adding some infrastructure soon to nudge users of old versions
forward, with the idea of maybe increasing our minimum version (and
removing this glue) sometime in the future"
* tag 'docs-5.2-fixes2' of git://git.lwn.net/linux:
drm/i915: Maintain consistent documentation subsection ordering
scripts/sphinx-pre-install: make it handle Sphinx versions
docs: Fix conf.py for Sphinx 2.0
docs: fix multiple doc build warnings in enumeration.rst
lib/list_sort: fix kerneldoc build error
docs: fix numaperf.rst and add it to the doc tree
doc: Cope with the deprecation of AutoReporter
doc: Cope with Sphinx logging deprecations
Diffstat (limited to 'lib')
-rw-r--r-- | lib/list_sort.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/list_sort.c b/lib/list_sort.c index 06e900c5587b..712ed1f4eb64 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -120,7 +120,8 @@ static void merge_final(void *priv, cmp_func cmp, struct list_head *head, * The latter offers a chance to save a few cycles in the comparison * (which is used by e.g. plug_ctx_cmp() in block/blk-mq.c). * - * A good way to write a multi-word comparison is + * A good way to write a multi-word comparison is:: + * * if (a->high != b->high) * return a->high > b->high; * if (a->middle != b->middle) |