linux-next: manual merge of the md tree with the tree

Hi Neil, Today's linux-next merge of the md tree got a conflict in drivers/md/raid1.c between commit 4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree and commit 41a336e01188 ("md/raid1: fix request counting bug in new 'barrier' code") from the md tree. I fixed it up (a line

linux-next: manual merge of the md tree with the tree

Hi Neil, Today's linux-next merge of the md tree got a conflict in fs/bio.c between commit 4363ac7c13a9 ("block: Implement support for WRITE SAME") from the block tree and commit 368e564836d3 ("block: makes bio_split support bio without data") from the md tree. I fixed it up (I think - see below)