Merge remote-tracking branch 'block/for-next'

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-sysfs.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
index f4622dd8fc590b2bbcaee444b24ab2f55336503d,97f2a5f977b16c241b6cd5c1f6d7874c8bef5b42..5e518c7103a7f7bc6df85595f6643d926c9bb501
--- 1/drivers/md/raid1.c
--- 2/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@@ -1116,15 -1117,8 +1116,13 @@@ read_again
                goto retry_write;
        }
  
 +      r1_bio_write_done(r1_bio);
 +
 +      /* In case raid1d snuck in to freeze_array */
 +      wake_up(&conf->wait_barrier);
 +
        if (do_sync || !bitmap || !plugged)
                md_wakeup_thread(mddev->thread);
- 
-       return 0;
  }
  
  static void status(struct seq_file *seq, mddev_t *mddev)

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc include/linux/genhd.h
Simple merge