linux-next: manual merge of the driver-core tree with the jc_docs tree

Hi all,

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

Documentation/driver-api/driver-model/index.rst

between commit:

a592a36e49372 ("Documentation: use a source-read extension for the index link boilerplate")

from the jc_docs tree and commit:

62eb557580eb2 ("revocable: Revocable resource management")

from the driver-core 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.

diff --cc Documentation/driver-api/driver-model/index.rst
index abeb4b36636b6,8e1ee21185dfb..0000000000000
@@@ -14,3 -14,11 +14,4 @@@ Driver Mode
     overview
     platform
     porting
+    revocable
 -
 -.. only::  subproject and html
 -
 -   Indices
 -   =======
 -
 -   * :ref:`genindex`