linux-kernel - Re: linux-next: manual merge of the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 3 Jun 2020 12:27:50 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Theodore Ts'o <tytso@....edu>
Cc:     Jonathan Corbet <corbet@....net>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>
Subject: 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 <sfr@...b.auug.org.au> 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..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

This is now a conflict between the ext4 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped