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 fixed in the latter was removed by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgp6bOELZxdyF.pgp
Description: PGP signature
