From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jul 2019 18:29:24 +0000 (-0700)
Subject: Merge tag 'docs-5.3-1' of git://git.lwn.net/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ea54d9b0d655dab5b5becc7d6456082089fc166;p=linux.git

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

Pull documentation fixes from Jonathan Corbet:
 "This is mostly a set of follow-on fixes from Mauro fixing various
  fallout from the massive RST conversion; a few other small fixes as
  well"

* tag 'docs-5.3-1' of git://git.lwn.net/linux: (21 commits)
  docs: phy: Drop duplicate 'be made'
  doc:it_IT: translations in process/
  docs/vm: transhuge: fix typo in madvise reference
  doc:it_IT: rephrase statement
  doc:it_IT: align translation to mainline
  docs: load_config.py: ensure subdirs end with "/"
  docs: virtual: add it to the documentation body
  docs: remove extra conf.py files
  docs: load_config.py: avoid needing a conf.py just due to LaTeX docs
  scripts/sphinx-pre-install: seek for Noto CJK fonts for pdf output
  scripts/sphinx-pre-install: cleanup Gentoo checks
  scripts/sphinx-pre-install: fix latexmk dependencies
  scripts/sphinx-pre-install: don't use LaTeX with CentOS 7
  scripts/sphinx-pre-install: fix script for RHEL/CentOS
  docs: conf.py: only use CJK if the font is available
  docs: conf.py: add CJK package needed by translations
  docs: pdf: add all Documentation/*/index.rst to PDF output
  docs: fix broken doc references due to renames
  docs: power: add it to to the main documentation index
  docs: powerpc: convert docs to ReST and rename to *.rst
  ...
---

3ea54d9b0d655dab5b5becc7d6456082089fc166
diff --cc Documentation/virt/kvm/index.rst
index 0b206a06f5be0,0000000000000..ada224a511fec
mode 100644,000000..100644
--- a/Documentation/virt/kvm/index.rst
+++ b/Documentation/virt/kvm/index.rst
@@@ -1,11 -1,0 +1,12 @@@
 +.. SPDX-License-Identifier: GPL-2.0
 +
 +===
 +KVM
 +===
 +
 +.. toctree::
 +   :maxdepth: 2
 +
 +   amd-memory-encryption
 +   cpuid
++   vcpu-requests
diff --cc MAINTAINERS
index ce6546c02dff7,ff3ae2be27464..4b59bdc1aaf22
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12137,7 -12137,7 +12137,7 @@@ M:	Thomas Hellstrom <thellstrom@vmware.
  M:	"VMware, Inc." <pv-drivers@vmware.com>
  L:	virtualization@lists.linux-foundation.org
  S:	Supported
- F:	Documentation/virt/paravirt_ops.txt
 -F:	Documentation/virtual/paravirt_ops.rst
++F:	Documentation/virt/paravirt_ops.rst
  F:	arch/*/kernel/paravirt*
  F:	arch/*/include/asm/paravirt*.h
  F:	include/linux/hypervisor.h