Subject: linux-next: manual merge of the jc_docs tree with the ext4 tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Aug 2018 11:15:12 +1000

Hi all,

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

  Documentation/index.rst

between commit:

  6684874af063 ("docs: create filesystem internal section")

from the ext4 tree and commit:

  85c32d9c6f3e ("doc: move away translations from top-level index")

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/index.rst
index f95ba981f8cd,5d310d960f82..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -102,40 -104,13 +104,24 @@@ implementation
  
     sh/index
  
 +Filesystem Documentation
 +------------------------
 +
 +The documentation in this section are provided by specific filesystem
 +subprojects.
 +
 +.. toctree::
 +   :maxdepth: 2
 +
 +   filesystems/ext4/index
 +
- Korean translations
- -------------------
- 
- .. toctree::
-    :maxdepth: 1
- 
-    translations/ko_KR/index
- 
- Chinese translations
- --------------------
+ Translations
+ ------------
  
  .. toctree::
-    :maxdepth: 1
- 
-    translations/zh_CN/index
- 
- Japanese translations
- ---------------------
- 
- .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
  
-    translations/ja_JP/index
+    translations/index
  
  Indices and tables
  ==================