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

2017-02-22 Thread Stephen Rothwell
Hi Shaohua, Today's linux-next merge of the md tree got a conflict in: drivers/md/raid1.c between commit: 309bd96af9e2 ("md: cleanup bio op / flags handling in raid1_write_request") from Linus' tree and commit: 52b82fcc095d ("md/raid1: handle flush request correctly") from the md

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

2017-02-22 Thread Stephen Rothwell
Hi Shaohua, Today's linux-next merge of the md tree got a conflict in: drivers/md/raid1.c between commit: 309bd96af9e2 ("md: cleanup bio op / flags handling in raid1_write_request") from Linus' tree and commit: 52b82fcc095d ("md/raid1: handle flush request correctly") from the md

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

2014-01-14 Thread Stephen Rothwell
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

2014-01-14 Thread Stephen Rothwell
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

2012-09-20 Thread Stephen Rothwell
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

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

2012-09-20 Thread Stephen Rothwell
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)