Subject: linux-next: manual merge of the btrfs-kdave tree with the btrfs-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 May 2018 09:47:04 +1000

Hi David,

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

  fs/btrfs/props.c

between commit:

  f764b4f4bb26 ("btrfs: property: Set incompat flag if lzo/zstd compression is set")

from the btrfs-fixes tree and commit:

  e37739baf401 ("btrfs: allow setting zstd level")

from the btrfs-kdave 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 fs/btrfs/props.c
index dc6140013ae8,c85bb04a1cc3..000000000000
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@@ -391,17 -390,14 +391,17 @@@ static int prop_compression_apply(struc
  		return 0;
  	}
  
 -	if (!strncmp("lzo", value, 3))
 +	if (!strncmp("lzo", value, 3)) {
  		type = BTRFS_COMPRESS_LZO;
 -	else if (!strncmp("zlib", value, 4))
 +		btrfs_set_fs_incompat(fs_info, COMPRESS_LZO);
 +	} else if (!strncmp("zlib", value, 4)) {
  		type = BTRFS_COMPRESS_ZLIB;
- 	} else if (!strncmp("zstd", value, len)) {
 -	else if (!strncmp("zstd", value, 4))
++	} else if (!strncmp("zstd", value, 4)) {
  		type = BTRFS_COMPRESS_ZSTD;
 -	else
 +		btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD);
 +	} else {
  		return -EINVAL;
 +	}
  
  	BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS;
  	BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS;