Re: linux-next: manual merge of the f2fs tree with the fscrypt tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]

Hi all,

On Wed, 8 Jul 2020 10:38:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the f2fs tree got a conflict in:
> 
>   Documentation/filesystems/f2fs.rst
> 
> between commit:
> 
>   38dff4e50c12 ("f2fs: add inline encryption support")
> 
> from the fscrypt tree and commit:
> 
>   a7c77c387b60 ("f2fs: fix to document reserved special compression extension")
> 
> from the f2fs 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.
> 
> diff --cc Documentation/filesystems/f2fs.rst
> index 8b4fac44f4e1,535021c46260..000000000000
> --- a/Documentation/filesystems/f2fs.rst
> +++ b/Documentation/filesystems/f2fs.rst
> @@@ -258,13 -258,8 +258,15 @@@ compress_extension=%s  Support adding s
>                          on compression extension list and enable compression on
>                          these file by default rather than to enable it via ioctl.
>                          For other files, we can still enable compression via ioctl.
> +                        Note that, there is one reserved special extension '*', it
> +                        can be set to enable compression for all files.
>  +inlinecrypt
>  +                       When possible, encrypt/decrypt the contents of encrypted
>  +                       files using the blk-crypto framework rather than
>  +                       filesystem-layer encryption. This allows the use of
>  +                       inline encryption hardware. The on-disk format is
>  +                       unaffected. For more details, see
>  +                       Documentation/block/inline-encryption.rst.
>   ====================== ============================================================
>   
>   Debugfs Entries

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]