Hi Jens, On Tue, 01 Nov 2011 09:09:45 +0100 Jens Axboe <axboe@xxxxxxxxx> wrote: > > Fixup looks good, however don't you get the same conflict in basically > all the raid personalities? Fixup is indeed just the simple int -> void > transition, conflict is because of the mddev_t -> struct mddev change > that is now in Linus' tree. I got these conflicts in all the raid personalities a while ago. I am not sure why this turned up for just raid10 again. > I'll push my pending off to Linus today or tomorrow, so this will be > resolved shortly. OK, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpgJJ8f2tLUE.pgp
Description: PGP signature
