Merge tag 'docs-5.10' of git://git.lwn.net/linux

Pull documentation updates from Jonathan Corbet:
 "As hoped, things calmed down for docs this cycle; fewer changes and
  almost no conflicts at all. This includes:

   - A reworked and expanded user-mode Linux document

   - Some simplifications and improvements for submitting-patches.rst

   - An emergency fix for (some) problems with Sphinx 3.x

   - Some welcome automarkup improvements to automatically generate
     cross-references to struct definitions and other documents

   - The usual collection of translation updates, typo fixes, etc"

* tag 'docs-5.10' of git://git.lwn.net/linux: (81 commits)
  gpiolib: Update indentation in driver.rst for code excerpts
  Documentation/admin-guide: tainted-kernels: Fix typo occured
  Documentation: better locations for sysfs-pci, sysfs-tagging
  docs: programming-languages: refresh blurb on clang support
  Documentation: kvm: fix a typo
  Documentation: Chinese translation of Documentation/arm64/amu.rst
  doc: zh_CN: index files in arm64 subdirectory
  mailmap: add entry for <mstarovoitov@marvell.com>
  doc: seq_file: clarify role of *pos in ->next()
  docs: trace: ring-buffer-design.rst: use the new SPDX tag
  Documentation: kernel-parameters: clarify "module." parameters
  Fix references to nommu-mmap.rst
  docs: rewrite admin-guide/sysctl/abi.rst
  docs: fb: Remove vesafb scrollback boot option
  docs: fb: Remove sstfb scrollback boot option
  docs: fb: Remove matroxfb scrollback boot option
  docs: fb: Remove framebuffer scrollback boot option
  docs: replace the old User Mode Linux HowTo with a new one
  Documentation/admin-guide: blockdev/ramdisk: remove use of "rdev"
  Documentation/admin-guide: README & svga: remove use of "rdev"
  ...

diff --cc .mailmap
index 0894a8b,054cfcb..e4ccac4
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -170,37 -163,32 +170,38 @@@ Juha Yrjola <juha.yrjola@solidboot.com
  Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
  Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
  Kay Sievers <kay.sievers@vrfy.org>
 +Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
 +Kees Cook <keescook@chromium.org> <keescook@google.com>
 +Kees Cook <keescook@chromium.org> <kees@outflux.net>
 +Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
  Kenneth W Chen <kenneth.w.chen@intel.com>
 -Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
  Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
 +Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
  Koushik <raghavendra.koushik@neterion.com>
 -Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
  Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
 +Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 -Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
 -Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
  Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
  Leonid I Ananiev <leonid.i.ananiev@intel.com>
 +Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
 +Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
 +Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
  Linas Vepstas <linas@austin.ibm.com>
 -Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
  Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
 -Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
 +Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
 +<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
  Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
 +Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
  Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
  Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
 -Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
  Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 +Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
  Mark Brown <broonie@sirena.org.uk>
+ Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
  Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
 -Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
  Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
  Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
 +Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
  Mathieu Othacehe <m.othacehe@gmail.com>
  Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
  Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/arm64/index.rst
Simple merge

diff --cc Documentation/driver-api/dma-buf.rst
Simple merge

diff --cc Documentation/kbuild/llvm.rst
Simple merge

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc MAINTAINERS
Simple merge