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

[Stephen Rothwell]

Hi all,

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

  Documentation/filesystems/fiemap.rst

between commit:

  469581d9e5c9 ("fs: move fiemap range validation into the file systems instances")

from the ext4 tree and commit:

  e6f7df74ec1a ("docs: filesystems: convert fiemap.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/fiemap.rst
index 35c8571eccb6,2a572e7edc08..000000000000
--- a/Documentation/filesystems/fiemap.rst
+++ b/Documentation/filesystems/fiemap.rst
@@@ -203,10 -206,9 +206,10 @@@ EINTR once fatal signal received
  
  
  Flag checking should be done at the beginning of the ->fiemap callback via the
- fiemap_prep() helper:
 -fiemap_check_flags() helper::
++fiemap_prep() helper::
  
- int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo,
- 		u64 start, u64 *len, u32 supported_flags);
 -  int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
++  int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo,
++		  u64 start, u64 *len, u32 supported_flags);
  
  The struct fieinfo should be passed in as received from ioctl_fiemap(). The
  set of fiemap flags which the fs understands should be passed via fs_flags. If

Attachment: pgp3BDkBCDxMT.pgp
Description: OpenPGP digital signature