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

[Stephen Rothwell]

Hi Alasdair,

Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm-raid.c between commit 3f6bbd3ffd7b ("dm-raid: silence
compiler warning on rebuilds_per_group") from the md tree and commit
acc946bad465 ("his patch suppresses this warning:") from the
device-mapper tree.

I fixed it up (I just used the md tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpXFuONiMLXQ.pgp
Description: PGP signature