Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in
drivers/md/raid1.c and drivers/md/raid10.c between commit 9e882242c619
("block: Add submit_bio_wait(), remove from md") from the block tree and
commit "block: prep work for batch completion" from the akpm tree.I fixed it up (by removing the functions from the files as in the block tree patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgpxPFEbmoB8Q.pgp
Description: PGP signature
