From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2020 00:55:54 +0000 (-0800)
Subject: Merge tag 'docs-5.11' of git://git.lwn.net/linux
X-Git-Tag: v5.15~2234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff6135959a9150ad45cb92ca38da270903a74343;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull documentation updates from Jonathan Corbet:
 "A much quieter cycle for documentation (happily), with, one hopes, the
  bulk of the churn behind us. Significant stuff in this pull includes:

   - A set of new Chinese translations

   - Italian translation updates

   - A mechanism from Mauro to automatically format
     Documentation/features for the built docs

   - Automatic cross references without explicit :ref: markup

   - A new reset-controller document

   - An extensive new document on reporting problems from Thorsten

  That last patch also adds the CC-BY-4.0 license to LICENSES/dual;
  there was some discussion on this, but we seem to have consensus and
  an ack from Greg for that addition"

* tag 'docs-5.11' of git://git.lwn.net/linux: (50 commits)
  docs: fix broken cross reference in translations/zh_CN
  docs: Note that sphinx 1.7 will be required soon
  docs: update requirements to install six module
  docs: reporting-issues: move 'outdated, need help' note to proper place
  docs: Update documentation to reflect what TAINT_CPU_OUT_OF_SPEC means
  docs: add a reset controller chapter to the driver API docs
  docs: make reporting-bugs.rst obsolete
  docs: Add a new text describing how to report bugs
  LICENSES: Add the CC-BY-4.0 license
  Documentation: fix multiple typos found in the admin-guide subdirectory
  Documentation: fix typos found in admin-guide subdirectory
  kernel-doc: Fix example in Nested structs/unions
  docs: clean up sysctl/kernel: titles, version
  docs: trace: fix event state structure name
  docs: nios2: add missing ReST file
  scripts: get_feat.pl: reduce table width for all features output
  scripts: get_feat.pl: change the group by order
  scripts: get_feat.pl: make complete table more coincise
  scripts: kernel-doc: fix parsing function-like typedefs
  Documentation: fix typos found in process, dev-tools, and doc-guide subdirectories
  ...
---

ff6135959a9150ad45cb92ca38da270903a74343
diff --cc Documentation/x86/index.rst
index e7eb84484ddc,b4fcb6f258b2..4693e192b447
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@@ -33,4 -33,4 +33,5 @@@ x86-specific Documentatio
     i386/index
     x86_64/index
     sva
 +   sgx
+    features