Hi all,

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

  Documentation/filesystems/porting.rst

between commit:

  14e43bf43561 ("vfs: don't unnecessarily clone write access for writable fds")

from the vfs tree and commits:

  9b2e0016d04c ("bvec/iter: disallow zero-length segment bvecs")
  c42bca92be92 ("bio: don't copy bvec for direct IO")

from the block 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/porting.rst
index c2161de0f4ef,1f8cf8e10b34..000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -872,5 -870,14 +872,21 @@@ its result is kern_unmount() or kern_un
  
  **mandatory**
  
 +mnt_want_write_file() can now only be paired with mnt_drop_write_file(),
 +whereas previously it could be paired with mnt_drop_write() as well.
++
++---
++
++**mandatory**
++
+ zero-length bvec segments are disallowed, they must be filtered out before
+ passed on to an iterator.
+ 
+ ---
+ 
+ **mandatory**
+ 
+ For bvec based itererators bio_iov_iter_get_pages() now doesn't copy bvecs but
+ uses the one provided. Anyone issuing kiocb-I/O should ensure that the bvec and
+ page references stay until I/O has completed, i.e. until ->ki_complete() has
+ been called or returned with non -EIOCBQUEUED code.