On Thu, 2009-05-21 at 00:42 +1000, Stephen Rothwell wrote: > 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. Yes, I know, I was just adding urgency because scsi-misc has the two conflicting commits in it, so it can't be merged into block for-next. > > So they obviously moved into linus head but wasn't taken out of block > > for-next. > > Indeed. OK, so I think your pulling of my posmerge tree can cope with the fact that I did the necessary rebasing in block for-next before I made it the base of my combined tree .... think of this as a nice test. Just building now ... if it works, I'll push to SCSI post merge and all our problems should go away. James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
