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

[Stephen Rothwell]

Hi all,

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

  fs/btrfs/check-integrity.c

between commit:

  068afafa2589 ("btrfs: drop casts of bio bi_sector")

from the btrfs tree and commit:

  051707baf43b ("block: store a block_device pointer in struct bio")

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/check-integrity.c
index 6ff44e53814c,8791ad9b3ca5..000000000000
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@@ -2690,9 -2693,10 +2690,9 @@@ static void __btrfsic_submit_bio(struc
  		bio_is_patched = 0;
  		if (dev_state->state->print_mask &
  		    BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
- 			pr_info("submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_disk=%p)\n",
+ 			pr_info("submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_bdev=%p)\n",
  			       bio_op(bio), bio->bi_opf, segs,
- 			       bio->bi_iter.bi_sector, dev_bytenr, bio->bi_disk);
 -			       (unsigned long long)bio->bi_iter.bi_sector,
 -			       dev_bytenr, bio->bi_bdev);
++			       bio->bi_iter.bi_sector, dev_bytenr, bio->bi_bdev);
  
  		mapped_datav = kmalloc_array(segs,
  					     sizeof(*mapped_datav), GFP_NOFS);

Attachment: pgpmb09hCQmeX.pgp
Description: OpenPGP digital signature