Hi all,

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

  Documentation/filesystems/zonefs.rst

between commit:

  4c5fd3b791a0 ("zonefs: fix documentation typos etc.")

from Linus' tree and commit:

  9a6108124c1d ("docs: filesystems: convert zonefs.txt to ReST")

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/filesystems/zonefs.rst
index d54fa98ac158,7e733e751e98..000000000000
--- a/Documentation/filesystems/zonefs.rst
+++ b/Documentation/filesystems/zonefs.rst
@@@ -301,7 -308,8 +308,8 @@@ Mount option
  
  zonefs define the "errors=<behavior>" mount option to allow the user to specify
  zonefs behavior in response to I/O errors, inode size inconsistencies or zone
 -condition chages. The defined behaviors are as follow:
 +condition changes. The defined behaviors are as follow:
+ 
  * remount-ro (default)
  * zone-ro
  * zone-offline