linux-next: manual merge of the block tree with Linus' tree

[Stephen Rothwell]

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
drivers/md/raid5.c between commit e3620a3ad526 ("MD RAID5: Avoid
accessing gendisk or queue structs when not available") from Linus' tree
and commit 2f6db2a70734 ("raid5: use bio_reset()") from the block tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/md/raid5.c
index 24909eb,7bbd285..0000000
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@@ -666,16 -665,11 +665,13 @@@ static void ops_run_io(struct stripe_he
  			bi->bi_io_vec[0].bv_len = STRIPE_SIZE;
  			bi->bi_io_vec[0].bv_offset = 0;
  			bi->bi_size = STRIPE_SIZE;
- 			bi->bi_next = NULL;
  			if (rrdev)
  				set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags);
 -			trace_block_bio_remap(bdev_get_queue(bi->bi_bdev),
 -					      bi, disk_devt(conf->mddev->gendisk),
 -					      sh->dev[i].sector);
 +
 +			if (conf->mddev->gendisk)
 +				trace_block_bio_remap(bdev_get_queue(bi->bi_bdev),
 +						      bi, disk_devt(conf->mddev->gendisk),
 +						      sh->dev[i].sector);
  			generic_make_request(bi);
  		}
  		if (rrdev) {
@@@ -700,13 -700,9 +702,10 @@@
  			rbi->bi_io_vec[0].bv_len = STRIPE_SIZE;
  			rbi->bi_io_vec[0].bv_offset = 0;
  			rbi->bi_size = STRIPE_SIZE;
- 			rbi->bi_next = NULL;
 -			trace_block_bio_remap(bdev_get_queue(rbi->bi_bdev),
 -					      rbi, disk_devt(conf->mddev->gendisk),
 -					      sh->dev[i].sector);
 +			if (conf->mddev->gendisk)
 +				trace_block_bio_remap(bdev_get_queue(rbi->bi_bdev),
 +						      rbi, disk_devt(conf->mddev->gendisk),
 +						      sh->dev[i].sector);
  			generic_make_request(rbi);
  		}
  		if (!rdev && !rrdev) {

Attachment: pgp00000.pgp
Description: PGP signature