Hi James, On Wed, 20 May 2009 14:37:20 +0000 James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote: > > Unfortuantely, I still need the block tree for-next to be rebased up to > the current linus head because of a couple of conflicts: > > CONFLICT (content): Merge conflict in drivers/block/hd.c > CONFLICT (content): Merge conflict in drivers/block/mg_disk.c As discussed elsewhere, a merge of Linus' tree into the block tree will fix this. > So they obviously moved into linus head but wasn't taken out of block > for-next. Indeed. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpn7CUmEjQSG.pgp
Description: PGP signature
