linux-next: manual merge of the rust tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  Documentation/index.rst

between commit:

  0c7b4366f1ab ("docs: Rewrite the front page")

from the origin tree and commit:

  d07479b211b7 ("docs: add Rust documentation")

from the rust tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/index.rst
index 85eab6e990ab,00722aa20cd7..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -12,84 -18,134 +12,85 @@@ documents into a coherent whole.  Pleas
  documentation are welcome; join the linux-doc list at vger.kernel.org if
  you want to help out.
  
 -Licensing documentation
 ------------------------
 +Working with the development community
 +--------------------------------------
  
 -The following describes the license of the Linux kernel source code
 -(GPLv2), how to properly mark the license of individual files in the source
 -tree, as well as links to the full license text.
 -
 -* :ref:`kernel_licensing`
 -
 -User-oriented documentation
 ----------------------------
 -
 -The following manuals are written for *users* of the kernel — those who are
 -trying to get it to work optimally on a given system.
 +The essential guides for interacting with the kernel's development
 +community and getting your work upstream.
  
  .. toctree::
 -   :maxdepth: 2
 -
 -   admin-guide/index
 -   kbuild/index
 -
 -Firmware-related documentation
 -------------------------------
 -The following holds information on the kernel's expectations regarding the
 -platform firmwares.
 +   :maxdepth: 1
  
 -.. toctree::
 -   :maxdepth: 2
 +   process/development-process
 +   process/submitting-patches
 +   Code of conduct <process/code-of-conduct>
 +   maintainer/index
 +   All development-process docs <process/index>
  
 -   firmware-guide/index
 -   devicetree/index
  
 -Application-developer documentation
 ------------------------------------
 +Internal API manuals
 +--------------------
  
 -The user-space API manual gathers together documents describing aspects of
 -the kernel interface as seen by application developers.
 +Manuals for use by developers working to interface with the rest of the
 +kernel.
  
  .. toctree::
 -   :maxdepth: 2
 -
 -   userspace-api/index
 +   :maxdepth: 1
  
 +   core-api/index
 +   driver-api/index
 +   subsystem-apis
 +   Locking in the kernel <locking/index>
  
 -Introduction to kernel development
 -----------------------------------
 +Development tools and processes
 +-------------------------------
  
 -These manuals contain overall information about how to develop the kernel.
 -The kernel community is quite large, with thousands of developers
 -contributing over the course of a year.  As with any large community,
 -knowing how things are done will make the process of getting your changes
 -merged much easier.
 +Various other manuals with useful information for all kernel developers.
  
  .. toctree::
 -   :maxdepth: 2
 +   :maxdepth: 1
  
 -   process/index
 -   dev-tools/index
 +   process/license-rules
     doc-guide/index
 +   dev-tools/index
 +   dev-tools/testing-overview
     kernel-hacking/index
     trace/index
 -   maintainer/index
     fault-injection/index
     livepatch/index
+    rust/index
  
  
 -Kernel API documentation
 -------------------------
 +User-oriented documentation
 +---------------------------
  
 -These books get into the details of how specific kernel subsystems work
 -from the point of view of a kernel developer.  Much of the information here
 -is taken directly from the kernel source, with supplemental material added
 -as needed (or at least as we managed to add it — probably *not* all that is
 -needed).
 +The following manuals are written for *users* of the kernel — those who are
 +trying to get it to work optimally on a given system and application
 +developers seeking information on the kernel's user-space APIs.
  
  .. toctree::
 -   :maxdepth: 2
 +   :maxdepth: 1
  
 -   driver-api/index
 -   core-api/index
 -   locking/index
 -   accounting/index
 -   block/index
 -   cdrom/index
 -   cpu-freq/index
 -   fb/index
 -   fpga/index
 -   hid/index
 -   i2c/index
 -   iio/index
 -   isdn/index
 -   infiniband/index
 -   leds/index
 -   netlabel/index
 -   networking/index
 -   pcmcia/index
 -   power/index
 -   target/index
 -   timers/index
 -   spi/index
 -   w1/index
 -   watchdog/index
 -   virt/index
 -   input/index
 -   hwmon/index
 -   gpu/index
 -   security/index
 -   sound/index
 -   crypto/index
 -   filesystems/index
 -   mm/index
 -   bpf/index
 -   usb/index
 -   PCI/index
 -   scsi/index
 -   misc-devices/index
 -   scheduler/index
 -   mhi/index
 -   peci/index
 -
 -Architecture-agnostic documentation
 ------------------------------------
 +   admin-guide/index
 +   The kernel build system <kbuild/index>
 +   admin-guide/reporting-issues.rst
 +   User-space tools <tools/index>
 +   userspace-api/index
 +
 +See also: the `Linux man pages <https://www.kernel.org/doc/man-pages/>`_,
 +which are kept separately from the kernel's own documentation.
 +
 +Firmware-related documentation
 +------------------------------
 +The following holds information on the kernel's expectations regarding the
 +platform firmwares.
  
  .. toctree::
 -   :maxdepth: 2
 +   :maxdepth: 1
 +
 +   firmware-guide/index
 +   devicetree/index
  
 -   asm-annotations
  
  Architecture-specific documentation
  -----------------------------------

Attachment: pgprUYyJtJVVk.pgp
Description: OpenPGP digital signature