linux-next: manual merge of the jc_docs tree with the pci tree

linux-next: manual merge of the jc_docs tree with the pci tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

Hi Jonathan,

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

  Documentation/driver-api/index.rst

between commit:

  7618a41f1a25 ("docs-rst: Add a new directory for PCI documentation")

from the pci tree and commit:

  ea2ae0ecc9ad ("FireWire: add a Documentation driver-api chapter")

from the jc_docs 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/driver-api/index.rst
index e9e7d24169cf,1f0cdba2b2bf..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -29,7 -29,8 +29,8 @@@ available subsections can be seen below
     iio/index
     input
     usb/index
+    firewire
 -   pci
 +   pci/index
     spi
     i2c
     hsi

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]