Re: linux-next: manual merge of the jc_docs tree with the ext4 tree
Hi all, On Fri, 22 May 2020 13:06:16 +1000 Stephen Rothwell wrote: > > 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. > > diff --cc Documentation/filesystems/fiemap.rst > index 35c8571eccb6,2a572e7edc08.. > --- 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 This is now a conflict between the ext4 tree and Linus' tree. -- Cheers, Stephen Rothwell pgpStJO6sTeDh.pgp Description: OpenPGP digital signature
linux-next: manual merge of the jc_docs tree with the ext4 tree
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.. --- 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 pgpidZswDsIo2.pgp Description: OpenPGP digital signature
linux-next: manual merge of the jc_docs tree with the ext4 tree
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.. --- 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 == pgpUrIxc63N9X.pgp Description: OpenPGP digital signature