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

Conflicts:
	drivers/md/raid0.c
	fs/bio.c

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

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

diff --cc drivers/md/raid0.c
index a9e4fa95dfaa76ac1d38434ac8153a6ffe1132c6,1a8e5e3692b90c43d587a0fa4080680c5c258633..24b359717a7e8917a4955e36651e6eb4009dc393
--- 1/drivers/md/raid0.c
--- 2/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@@ -422,7 -431,7 +431,8 @@@ static int raid0_run(struct mddev *mdde
        if (md_check_no_bitmap(mddev))
                return -EINVAL;
        blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
 +      blk_queue_max_write_same_sectors(mddev->queue, mddev->chunk_sectors);
+       blk_queue_max_discard_sectors(mddev->queue, mddev->chunk_sectors);
  
        /* if private is not null, we are here after takeover */
        if (mddev->private == NULL) {