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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 9 Apr 2020 11:03:20 +1000

Hi all,

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

  Documentation/filesystems/9p.rst

between commit:

  07d241fd66ba ("docs: filesystems: convert 9p.txt to ReST")

from Linus' tree and commit:

  c6f141412d24 ("9p: document short read behaviour with O_NONBLOCK")

from the v9fs 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/9p.rst
index f054d1c45e86,3fb780ffdf23..000000000000
--- a/Documentation/filesystems/9p.rst
+++ b/Documentation/filesystems/9p.rst
@@@ -156,9 -132,18 +156,19 @@@ Option
    cachetag	cache tag to use the specified persistent cache.
  		cache tags for existing cache sessions can be listed at
  		/sys/fs/9p/caches. (applies only to cache=fscache)
 +  ============= ===============================================================
  
 -BEHAVIOR
++Behavior
+ ========
+ 
+ This section aims at describing 9p 'quirks' that can be different
+ from a local filesystem behaviors.
+ 
+  - Setting O_NONBLOCK on a file will make client reads return as early
+    as the server returns some data instead of trying to fill the read
+    buffer with the requested amount of bytes or end of file is reached.
+ 
 -RESOURCES
 +Resources
  =========
  
  Protocol specifications are maintained on github: