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

[Stephen Rothwell]

Hi Jens,

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

  fs/btrfs/compression.c

between commit:

  edf0e062aa6f ("Btrfs: fix BUG_ON in btrfs_submit_compressed_write")

from the btrfs-kdave tree and commit:

  81a75f6781de ("btrfs: use bio fields for op and flags")

from the block 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/compression.c
index 7a4d9c81aa2a,cefedabf0a92..000000000000
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@@ -401,11 -402,8 +402,11 @@@ int btrfs_submit_compressed_write(struc
  				BUG_ON(ret); /* -ENOMEM */
  			}
  
- 			ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
+ 			ret = btrfs_map_bio(root, bio, 0, 1);
 -			BUG_ON(ret); /* -ENOMEM */
 +			if (ret) {
 +				bio->bi_error = ret;
 +				bio_endio(bio);
 +			}
  
  			bio_put(bio);
  
@@@ -434,11 -433,8 +436,11 @@@
  		BUG_ON(ret); /* -ENOMEM */
  	}
  
- 	ret = btrfs_map_bio(root, WRITE, bio, 0, 1);
+ 	ret = btrfs_map_bio(root, bio, 0, 1);
 -	BUG_ON(ret); /* -ENOMEM */
 +	if (ret) {
 +		bio->bi_error = ret;
 +		bio_endio(bio);
 +	}
  
  	bio_put(bio);
  	return 0;